Skip to content

Transition from setuptools to hatchling #657

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.

Sign up for GitHub

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

Merged
jan-janssen merged 4 commits into from
May 22, 2025
Merged

Transition from setuptools to hatchling #657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ad7dfd0
Transition from setuptools to hatchling
jan-janssen May 22, 2025
1fd13a9
Format black
pyiron-runner May 22, 2025
cedd2e4
fix package name
jan-janssen May 22, 2025
40660a3
Merge remote-tracking branch 'origin/hatch' into hatch
jan-janssen May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .ci_support/environment-docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
channels:
- conda-forge
dependencies:
- hatchling
- hatch-vcs
Comment on lines +4 to +5
Copy link
Contributor

@coderabbitai coderabbitai bot May 22, 2025

Choose a reason for hiding this comment

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

🛠️ Refactor suggestion

Pin hatchling and hatch-vcs versions for reproducibility
Unpinned dependencies can drift and lead to inconsistencies across CI runs. Please specify explicit versions (e.g., align with other environments at hatchling =1.27.0 and hatch-vcs =0.4.0).

- - hatchling
- - hatch-vcs
+ - hatchling =1.27.0
+ - hatch-vcs =0.4.0
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
- hatchling
- hatch-vcs
- hatchling =1.27.0
- hatch-vcs =0.4.0
🤖 Prompt for AI Agents 
In .ci_support/environment-docs.yml around lines 4 to 5, the dependencies
'hatchling' and 'hatch-vcs' are listed without version pins. To ensure
reproducibility and consistency across CI runs, update these entries to specify
explicit versions, such as 'hatchling=1.27.0' and 'hatch-vcs=0.4.0', matching
the versions used in other environments.

- nbsphinx
- sphinx
- sphinx_rtd_theme
Expand Down
3 changes: 2 additions & 1 deletion .ci_support/environment-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ dependencies:
- mpi4py
- pyzmq =26.3.0
- flux-core =0.59.0
- versioneer =0.28
- hatchling =1.27.0
- hatch-vcs =0.4.0
- h5py
- matplotlib =3.10.0
- networkx =3.4.2
Expand Down
3 changes: 2 additions & 1 deletion .ci_support/environment-mini.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ dependencies:
- numpy
- cloudpickle =3.1.0
- pyzmq =26.2.0
- setuptools =80.1.0
- hatchling =1.27.0
- hatch-vcs =0.4.0
3 changes: 2 additions & 1 deletion .ci_support/environment-mpich.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ dependencies:
- pygraphviz =1.14
- ipython =9.0.2
- pysqa =0.2.4
- setuptools =80.8.0
- hatchling =1.27.0
- hatch-vcs =0.4.0
3 changes: 2 additions & 1 deletion .ci_support/environment-old.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ dependencies:
- networkx =2.8.8
- ipython =7.33.0
- pygraphviz =1.10
- setuptools =75.1.0
- hatchling =1.27.0
- hatch-vcs =0.4.0
3 changes: 2 additions & 1 deletion .ci_support/environment-openmpi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ dependencies:
- pygraphviz =1.14
- pysqa =0.2.4
- ipython =9.0.2
- setuptools =80.8.0
- hatchling =1.27.0
- hatch-vcs =0.4.0
3 changes: 2 additions & 1 deletion .ci_support/environment-win.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ dependencies:
- networkx =3.4.2
- pygraphviz =1.14
- ipython =9.0.2
- setuptools =80.8.0
- hatchling =1.27.0
- hatch-vcs =0.4.0
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
run: |
cp .ci_support/environment-old.yml environment.yml
python .ci_support/release.py; cat pyproject.toml
pip install versioneer[toml]==0.29
python setup.py sdist bdist_wheel
git update-index --assume-unchanged pyproject.toml executorlib/_version.py
hatchling build -t sdist -t wheel
- name: Publish distribution 📦 to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
20 changes: 5 additions & 15 deletions .github/workflows/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ jobs:
shell: bash -l {0}
timeout-minutes: 5
run: |
pip install versioneer[toml]==0.29
pip install . --no-deps --no-build-isolation
cd tests
python -m unittest discover .
Expand All @@ -95,7 +94,7 @@ jobs:
- name: Setup
shell: bash -l {0}
run: |
pip install versioneer[toml]==0.29 tomlkit
pip install tomlkit
python .ci_support/check.py
cat pyproject.toml
pip install . --no-deps --no-build-isolation
Expand Down Expand Up @@ -129,7 +128,6 @@ jobs:
shell: bash -l {0}
timeout-minutes: 10
run: |
pip install versioneer[toml]==0.29
pip install . --no-deps --no-build-isolation
python tests/benchmark/llh.py static >> timing.log
python tests/benchmark/llh.py process >> timing.log
Expand Down Expand Up @@ -161,9 +159,7 @@ jobs:
environment-file: environment.yml
- name: Install
shell: bash -l {0}
run: |
pip install versioneer[toml]==0.29
pip install . --no-deps --no-build-isolation
run: pip install . --no-deps --no-build-isolation
- name: Notebooks
shell: bash -l {0}
timeout-minutes: 5
Expand All @@ -190,9 +186,7 @@ jobs:
environment-file: .ci_support/environment-integration.yml
- name: Install
shell: bash -l {0}
run: |
pip install versioneer[toml]==0.29
pip install . --no-deps --no-build-isolation
run: pip install . --no-deps --no-build-isolation
- name: Notebooks
shell: bash -l {0}
timeout-minutes: 20
Expand All @@ -209,7 +203,7 @@ jobs:
shell: bash -l {0}
timeout-minutes: 5
run: |
echo -e '- coverage\n- flux-core =0.59.0\n- versioneer =0.28'>> .ci_support/environment-mpich.yml
echo -e '- coverage\n- flux-core =0.59.0'>> .ci_support/environment-mpich.yml
cat .ci_support/environment-mpich.yml
echo -e "channels:\n - conda-forge\n" > .condarc
- uses: conda-incubator/setup-miniconda@v3
Expand Down Expand Up @@ -240,7 +234,7 @@ jobs:
shell: bash -l {0}
timeout-minutes: 5
run: |
echo -e '- coverage\n- flux-core =0.59.0\n- flux-pmix=0.5.0\n- versioneer =0.28' >> .ci_support/environment-openmpi.yml
echo -e '- coverage\n- flux-core =0.59.0\n- flux-pmix=0.5.0' >> .ci_support/environment-openmpi.yml
cat .ci_support/environment-openmpi.yml
echo -e "channels:\n - conda-forge\n" > .condarc
- uses: conda-incubator/setup-miniconda@v3
Expand Down Expand Up @@ -303,7 +297,6 @@ jobs:
shell: bash -l {0}
timeout-minutes: 5
run: |
pip install versioneer[toml]==0.29
pip install . --no-deps --no-build-isolation
cd tests
python -m unittest discover .
Expand Down Expand Up @@ -341,7 +334,6 @@ jobs:
shell: bash -l {0}
timeout-minutes: 5
run: |
pip install versioneer[toml]==0.29
pip install . --no-deps --no-build-isolation
cd tests
python -m unittest discover .
Expand All @@ -364,7 +356,6 @@ jobs:
shell: bash -l {0}
timeout-minutes: 5
run: |
pip install versioneer[toml]==0.29
pip install . --no-deps --no-build-isolation
cd tests
python -m unittest discover .
Expand All @@ -386,7 +377,6 @@ jobs:
shell: bash -l {0}
timeout-minutes: 5
run: |
pip install versioneer[toml]==0.29
pip install . --no-deps --no-build-isolation
cd tests
python -m unittest discover .
Expand Down
1 change: 0 additions & 1 deletion .readthedocs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ build:
jobs:
pre_build:
# Generate the Sphinx configuration for this Jupyter Book so it builds.
- pip install versioneer[toml]==0.29
- pip install . --no-deps --no-build-isolation
- "cp README.md docs"
- "cp notebooks/*.ipynb docs"
Expand Down
3 changes: 2 additions & 1 deletion binder/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ dependencies:
- pyzmq =26.4.0
- flux-core =0.59.0
- flux-pmix =0.5.0
- versioneer =0.28
- hatchling =1.27.0
- hatch-vcs =0.4.0
- h5py =3.12.1
- matplotlib =3.10.0
- networkx =3.4.2
Expand Down
5 changes: 3 additions & 2 deletions executorlib/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from executorlib._version import get_versions as _get_versions
from executorlib.executor.flux import (
FluxClusterExecutor,
FluxJobExecutor,
Expand All @@ -10,6 +9,8 @@
)
from executorlib.standalone.cache import get_cache_data

from . import _version

__all__: list[str] = [
"get_cache_data",
"FluxJobExecutor",
Expand All @@ -19,4 +20,4 @@
"SlurmClusterExecutor",
]

__version__ = _get_versions()["version"]
__version__ = _version.__version__
Loading
Loading