skpkg: change version build file. - #151
sbillinge merged 11 commits into
Conversation
Sorry, something went wrong.
|
@sbillinge I also commit the setup.py and conftest.py now for targeting where the autommatic update breaks the functionality. Right now the CI will definitely fail. |
Sorry, something went wrong.
sbillinge
left a comment
There was a problem hiding this comment.
please see comments.
Sorry, something went wrong.
| @@ -1,12 +1,8 @@ | |||
| import io | |||
There was a problem hiding this comment.
I think we want the version of conftest.py from the original, not from skpkg
Sorry, something went wrong.
| #!/usr/bin/env python | ||
|
|
||
| # Extensions script for diffpy.pdffit2 | ||
| """PDFfit2 - real space structure refinement engine |
There was a problem hiding this comment.
we also want the original version of setup.py and not anything added by skpkg. This is needed because we are building c-code in this package.
Sorry, something went wrong.
|
@sbillinge The CI fails because of the incompatibility in pdffit.py def intro():
"""Show introductory message."""
import re
from diffpy.pdffit2 import __date__, __version__
date = __date__[:10]
d = {"version": __version__, "date": date, "year": date[:4] or "2019"}
msg = __intro_message__ % d
def filler(mx):
return mx.group(0).rstrip(" *").ljust(77) + "*"
msg_ljust = re.sub("(?m)^(.{1,77}|.{79}.*)$", filler, msg)
print(msg_ljust, file=output.stdout)
return
intro = staticmethod(intro)
here it needs to import the __date__, however, in scikit-package, it only takes __version__ and did not use __date__. So, should we add the attribute of __date__ in version.py? |
Sorry, something went wrong.
Codecov Report✅ All modified and coverable lines are covered by tests. @@ Coverage Diff @@
## migration #151 +/- ##
==========================================
Coverage 98.97% 98.97%
==========================================
Files 6 6
Lines 1267 1270 +3
==========================================
+ Hits 1254 1257 +3
Misses 13 13
|
Sorry, something went wrong.
| ############################################################################## | ||
| """PDFfit2 - real space structure refinement program.""" | ||
|
|
||
| # WARNING: Do NOT remove the isort: off/on comments in this file. |
There was a problem hiding this comment.
We need to keep the old code in this module
Sorry, something went wrong.
@sbillinge Ready to a first round review. Note that the file that still needs to be in the next PR are setup.py and tests/conftest.py and I'm not sure where the edits made by package update breaks the test on my local.
(diffpy.pdffit2) ~/dbs/diffpy.pdffit2/diffpy.pdffit2 git:[scikit-update-3] pytest ==================================================================== test session starts ===================================================================== platform darwin -- Python 3.13.9, pytest-9.0.1, pluggy-1.6.0 rootdir: /Users/huarundong/dbs/diffpy.pdffit2/diffpy.pdffit2 configfile: pyproject.toml collected 0 items / 5 errors =========================================================================== ERRORS =========================================================================== _________________________________________________________ ERROR collecting tests/test_exceptions.py __________________________________________________________ ImportError while importing test module '/Users/huarundong/dbs/diffpy.pdffit2/diffpy.pdffit2/tests/test_exceptions.py'. Hint: make sure your test modules/packages have valid Python names. Traceback: /opt/miniconda3/envs/diffpy.pdffit2/lib/python3.13/importlib/__init__.py:88: in import_module return _bootstrap._gcd_import(name[level:], package, level) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ tests/test_exceptions.py:21: in <module> from diffpy.pdffit2 import PdfFit, pdffit2 E ModuleNotFoundError: No module named 'diffpy.pdffit2' ___________________________________________________________ ERROR collecting tests/test_pdffit.py ____________________________________________________________ ImportError while importing test module '/Users/huarundong/dbs/diffpy.pdffit2/diffpy.pdffit2/tests/test_pdffit.py'. Hint: make sure your test modules/packages have valid Python names. Traceback: /opt/miniconda3/envs/diffpy.pdffit2/lib/python3.13/importlib/__init__.py:88: in import_module return _bootstrap._gcd_import(name[level:], package, level) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ tests/test_pdffit.py:9: in <module> from diffpy.pdffit2 import PdfFit, pdffit2 E ModuleNotFoundError: No module named 'diffpy.pdffit2' _______________________________________________________ ERROR collecting tests/test_phase_fractions.py _______________________________________________________ ImportError while importing test module '/Users/huarundong/dbs/diffpy.pdffit2/diffpy.pdffit2/tests/test_phase_fractions.py'. Hint: make sure your test modules/packages have valid Python names. Traceback: /opt/miniconda3/envs/diffpy.pdffit2/lib/python3.13/importlib/__init__.py:88: in import_module return _bootstrap._gcd_import(name[level:], package, level) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ tests/test_phase_fractions.py:9: in <module> from diffpy.pdffit2 import PdfFit E ModuleNotFoundError: No module named 'diffpy.pdffit2' ________________________________________________________ ERROR collecting tests/test_shape_factors.py ________________________________________________________ ImportError while importing test module '/Users/huarundong/dbs/diffpy.pdffit2/diffpy.pdffit2/tests/test_shape_factors.py'. Hint: make sure your test modules/packages have valid Python names. Traceback: /opt/miniconda3/envs/diffpy.pdffit2/lib/python3.13/importlib/__init__.py:88: in import_module return _bootstrap._gcd_import(name[level:], package, level) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ tests/test_shape_factors.py:11: in <module> from diffpy.pdffit2 import PdfFit, pdffit2 E ModuleNotFoundError: No module named 'diffpy.pdffit2' ___________________________________________________________ ERROR collecting tests/test_version.py ___________________________________________________________ ImportError while importing test module '/Users/huarundong/dbs/diffpy.pdffit2/diffpy.pdffit2/tests/test_version.py'. Hint: make sure your test modules/packages have valid Python names. Traceback: /opt/miniconda3/envs/diffpy.pdffit2/lib/python3.13/importlib/__init__.py:88: in import_module return _bootstrap._gcd_import(name[level:], package, level) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ tests/test_version.py:3: in <module> import diffpy.pdffit2 # noqa ^^^^^^^^^^^^^^^^^^^^^ E ModuleNotFoundError: No module named 'diffpy.pdffit2' ================================================================== short test summary info =================================================================== ERROR tests/test_exceptions.py ERROR tests/test_pdffit.py ERROR tests/test_phase_fractions.py ERROR tests/test_shape_factors.py ERROR tests/test_version.py !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Interrupted: 5 errors during collection !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ===================================================================== 5 errors in 0.21s ======================================================================which is the same as the breaking CI here. Something that automatically deleted must break the import of the file.