-
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?
Changes from 3 commits
e009dff
f4c5bf1
af35472
88f3e95
02cc3aa
445896f
8d77856
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -142,5 +142,11 @@ dmypy.json | |||||||
| # geoh5 locks | ||||||||
| *.geoh5.lock | ||||||||
|
|
||||||||
| #version ignore | ||||||||
| # auto-generated version file | ||||||||
| las_geoh5/_version.py | ||||||||
| # not using poetry to lock, but pixi | ||||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||
| poetry.lock | ||||||||
|
|
||||||||
| # pixi environments | ||||||||
| .pixi/* | ||||||||
| !.pixi/config.toml | ||||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. replace call to poetry for pylint by: |
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,108 @@ | ||||||
| [workspace] | ||||||
| requires-pixi = ">=0.54" | ||||||
| channels = ["https://repo.prefix.dev/conda-forge"] | ||||||
| platforms = ["win-64", "linux-64"] | ||||||
|
|
||||||
| [dependencies] | ||||||
| # dependencies resolved from conda | ||||||
| ## direct dependencies: | ||||||
| #---------------------- | ||||||
| lasio = "0.31.*" | ||||||
| numpy = "1.26.*" | ||||||
| tqdm = ">=4.66.1, 4.*" | ||||||
|
|
||||||
| ## indirect dependencies from remaining pip packages: | ||||||
| #---------------------------------------------------- | ||||||
| h5py = ">=3.2.1, 3.*" | ||||||
| pydantic = ">=2.5.2, 2.*" | ||||||
|
|
||||||
| [pypi-dependencies] | ||||||
| las-geoh5 = { path = ".", editable = true } | ||||||
|
|
||||||
| [environments] | ||||||
| #prod-py310 = {features = ["py310", "mirageo"], solve-group = "prod-py310"} | ||||||
| #prod-py311 = {features = ["py311", "mirageo"], solve-group = "prod-py311"} | ||||||
| #prod-py312 = {features = ["py312", "mirageo"], solve-group = "prod-py312"} | ||||||
| #test-prod-py310 = {features = ["py310", "mirageo", "test"], solve-group = "prod-py310"} | ||||||
| #test-prod-py311 = {features = ["py311", "mirageo", "test"], solve-group = "prod-py311"} | ||||||
| #test-prod-py312 = {features = ["py312", "mirageo", "test"], solve-group = "prod-py312"} | ||||||
|
|
||||||
| py310 = {features = ["py310", "mirageo-git", "test"], solve-group = "default"} | ||||||
| py311 = {features = ["py311", "mirageo-git", "test"]} | ||||||
| py312 = {features = ["py312", "mirageo-git", "test"]} | ||||||
|
|
||||||
| 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"} | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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
Suggested change
|
||||||
|
|
||||||
| [feature.py310.dependencies] | ||||||
| python = "3.10.*" | ||||||
|
|
||||||
| [feature.py311.dependencies] | ||||||
| python = "3.11.*" | ||||||
|
|
||||||
| [feature.py312.dependencies] | ||||||
| python = "3.12.*" | ||||||
|
|
||||||
| #[feature.mirageo.dependencies] | ||||||
| #geoh5py = ">=0.12.0a1, 0.12.*" | ||||||
|
|
||||||
| [feature.mirageo-git.pypi-dependencies] | ||||||
| geoh5py = { git = "https://github.com/MiraGeoscience/geoh5py.git", rev = "develop" } | ||||||
|
|
||||||
| [feature.dev.dependencies] | ||||||
| Pygments = '*' | ||||||
| ipython = "*" | ||||||
|
|
||||||
| [feature.dev.tasks] | ||||||
| repl = "ipython" | ||||||
|
|
||||||
| [feature.test.dependencies] | ||||||
| packaging = "*" | ||||||
| pylint = "*" | ||||||
| pytest = "*" | ||||||
| pytest-cov = "*" | ||||||
| pyyaml = "*" | ||||||
| jinja2 = "*" | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. jinja is not needed anymore
Suggested change
|
||||||
|
|
||||||
| [feature.test.tasks] | ||||||
| test = "pytest tests --cov --cov-report=xml" | ||||||
| _pytest-docs = "pytest docs" | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. issue: thre are not tests in docs
Suggested change
|
||||||
|
|
||||||
| [feature.test.tasks.test-local] | ||||||
| args = [{ arg = "packages", default = "geoh5py" }] | ||||||
| depends-on = [ | ||||||
| {task = "use-local-deps", args = [ "{{ packages }}" ]}, | ||||||
| {task = "show-pip-source", args = [ "{{ packages }}" ]}, | ||||||
| {task = "test"} | ||||||
| ] | ||||||
|
|
||||||
| [feature.doc.dependencies] | ||||||
| sphinx = ">=5.3, 5.*" | ||||||
| sphinx-rtd-theme = "*" | ||||||
| sphinx-autodoc-typehints = "*" | ||||||
|
|
||||||
| [feature.doc.tasks] | ||||||
| build-docs = "sphinx-build -nW -b html docs docs/_build" | ||||||
| linkcheck-docs = "sphinx-build -nW -b linkcheck docs docs/_build" | ||||||
|
|
||||||
| [tasks.test-docs] | ||||||
| depends-on = [{task = "_pytest-docs", environment = "test-docs"}] | ||||||
|
|
||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. issue: irrevelant in this project
Suggested change
|
||||||
| [tasks.show-pip-source] | ||||||
| args = [{ arg = "packages", "default" = "geoh5py" }] | ||||||
| cmd = "uv pip show {{packages}}" | ||||||
|
|
||||||
| [tasks.use-local-deps] | ||||||
| args = [{ arg = "packages", default = "geoh5py" }] | ||||||
| cmd = """ | ||||||
| uv pip install --no-deps --force-reinstall \ | ||||||
| {% for package in packages | split %} -e ../{{ package | trim }}{% endfor %} | ||||||
| """ | ||||||
|
|
||||||
| [tasks.test-pyvers] | ||||||
| depends-on = [ | ||||||
| {task = "test", environment = "py310"}, | ||||||
| {task = "test", environment = "py311"}, | ||||||
| {task = "test", environment = "py312"}, | ||||||
| ] | ||||||
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.