Skip to content

Move resampler out of parsers, remove relative paths for import - #163

Closed
alisnwu wants to merge 8 commits into
diffpy:mainfrom
alisnwu:utils-restructure
Closed

Move resampler out of parsers, remove relative paths for import#163
alisnwu wants to merge 8 commits into
diffpy:mainfrom
alisnwu:utils-restructure

Conversation

@alisnwu

Copy link
Copy Markdown

closes#138

All discussions made in #158

@sbillinge Ready for review

@codecov

codecovBot commented Nov 8, 2024

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 99.17%. Comparing base (0b90f3e) to head (f32c805).
Report is 7 commits behind head on main.

Additional details and impacted files
@@ Coverage Diff @@## main #163 +/- ##
=======================================
Coverage 99.17% 99.17% =======================================
Files 7 7 Lines 242 243 +1 =======================================
+ Hits 240 241 +1 
Misses 2 2 
Files with missing linesCoverage Δ
tests/test_loaddata.py97.77% <100.00%> (ø)
tests/test_resample.py94.73% <100.00%> (ø)
tests/test_serialization.py100.00% <100.00%> (ø)

@sbillingesbillinge left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this has gone a bit wrong again. Let's close this and try again.



def loadData(filename, minrows=10, headers=False, hdel="=", hignore=None, **kwargs):
def load_data(filename, minrows=10, headers=False, hdel="=", hignore=None, **kwargs):

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we do not want this change (please see the discussion on #163 ). Please revert.



class Diffraction_object:
class DiffractionObject:

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we want this change, but we want to do it as a deprecation. Please see the discussion on #163

@alisnwualisnwu changed the title Move resampler out of parsers, rename files and functions to PEP8 standardsMove resampler out of parsers, remove relative paths for importNov 8, 2024
@alisnwu

Copy link
Copy Markdown
Author

@sbillinge I've reverted those and now the only changes is the resampler path and removing the relative path imports in parsers

@sbillinge

Copy link
Copy Markdown
Contributor

@alisnwu I will close this. I was expecting you to do it this way, but we don't want the committee and the reverts in the history. Sorry for the wasted work of reverting commits

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

move resamplers out of parsers?

2 participants

@alisnwu@sbillinge