-
Notifications
You must be signed in to change notification settings - Fork 1
DEVOPS-693: migrate from conda-lock to pixi #90
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: develop
Are you sure you want to change the base?
Conversation
…ibility - Changed the required Python version from >=3.10,<4.0 to >=3.9,<4.0. - Expanded the keywords list for better discoverability. - Added specific dependencies for geoh5py, lasio, numpy, pydantic, and tqdm. - Removed unnecessary dynamic dependencies and cleaned up the classifiers section. - Updated the versioning strategy to maintain consistency with conda recipe versioning in tests. - Refactored the version test to handle edge cases for version comparison.
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## develop #90 +/- ##
===========================================
- Coverage 93.62% 93.60% -0.03%
===========================================
Files 22 22
Lines 1176 1172 -4
===========================================
- Hits 1101 1097 -4
Misses 75 75
🚀 New features to boost your workflow:
|
tests/version_test.py
Outdated
| if ( | ||
| project_version.base_version == "0.0.0" | ||
| and conda_version.base_version == "0.0.0" | ||
| ): | ||
| return | ||
|
|
||
| if "0.0.0" in (project_version.base_version, conda_version.base_version): | ||
| assert ( | ||
| project_version.base_version != "0.0.0" | ||
| or conda_version.base_version != "0.0.0" | ||
| ) | ||
| else: | ||
| assert project_version.base_version == conda_version.base_version |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
issue: why this change, when the orignal code is working in the other repos?
| *.h5 filter=lfs diff=lfs merge=lfs -text | ||
| *.ipynb filter=lfs diff=lfs merge=lfs -text | ||
| *.min.js filter=lfs diff=lfs merge=lfs -text | ||
| # SCM syntax highlighting & preventing 3-way merges |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| # SCM syntax highlighting & preventing 3-way merges | |
| # SCM syntax highlighting & preventing 3-way merges |
| #version ignore | ||
| # auto-generated version file | ||
| las_geoh5/_version.py | ||
| # not using poetry to lock, but pixi |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| # not using poetry to lock, but pixi | |
| # not using poetry to lock, but pixi |
pixi.toml
Outdated
| pytest = "*" | ||
| pytest-cov = "*" | ||
| pyyaml = "*" | ||
| jinja2 = "*" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jinja is not needed anymore
| jinja2 = "*" |
pixi.toml
Outdated
|
|
||
| default = {features = ["py310", "mirageo-git", "test", "dev"], solve-group = "default"} | ||
| docs = {features = ["py310", "mirageo-git", "doc"], solve-group = "default"} | ||
| test-docs = {features = ["py310", "mirageo-git", "test", "doc"], solve-group = "default"} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not needed here (that was for OMF): there is not test of the docs
| test-docs = {features = ["py310", "mirageo-git", "test", "doc"], solve-group = "default"} |
pixi.toml
Outdated
|
|
||
| [feature.test.tasks] | ||
| test = "pytest tests --cov --cov-report=xml" | ||
| _pytest-docs = "pytest docs" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
issue: thre are not tests in docs
| _pytest-docs = "pytest docs" |
pixi.toml
Outdated
| [tasks.test-docs] | ||
| depends-on = [{task = "_pytest-docs", environment = "test-docs"}] | ||
|
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
issue: irrevelant in this project
| [tasks.test-docs] | |
| depends-on = [{task = "_pytest-docs", environment = "test-docs"}] |
| license = "MIT" | ||
| keywords = ["geology", "geophysics", "earth sciences", "io", "data", "interoperability"] | ||
| keywords = [ | ||
| "las", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
| "geoh5", | ||
| "geology", | ||
| "geophysics", | ||
| "earth-sciences", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
suggestion: add "open-science" and order the list alphabetically
|
|
||
| [tool.pytest.ini_options] | ||
| #addopts = | ||
| testpaths = ["tests"] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
suggestion: remove. Likely not needed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
replace call to poetry for pylint by: pixi run --locked pylint
sebhmg
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
see some suggestions for changes
- Removed the test-docs feature from pixi.toml to streamline dependencies. - Simplified the get_conda_recipe_version function in version_test.py by directly reading and rendering the recipe.yaml file. - Updated the test_version_is_consistent function to assert version equality directly, removing unnecessary checks for "0.0.0".
for more information, see https://pre-commit.ci
…ort is correctly placed
- Modify codespell exclusions in .pre-commit-config.yaml - Upgrade build environment to Ubuntu 24.04 and adjust Python tools in .readthedocs.yml - Enhance Sphinx configuration in conf.py with additional extensions and Google Analytics support
DEVOPS-693 - migrate from conda-lock to pixi