Skip to content

Commit a629ff4

Browse files
Transition from setuptools to hatchling (#657)
* Transition from setuptools to hatchling * Format black * fix package name --------- Co-authored-by: pyiron-runner <[email protected]>
1 parent 831451b commit a629ff4

15 files changed

+64
-759
lines changed

.ci_support/environment-docs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
channels:
22
- conda-forge
33
dependencies:
4+
- hatchling
5+
- hatch-vcs
46
- nbsphinx
57
- sphinx
68
- sphinx_rtd_theme

.ci_support/environment-integration.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ dependencies:
99
- mpi4py
1010
- pyzmq =26.3.0
1111
- flux-core =0.59.0
12-
- versioneer =0.28
12+
- hatchling =1.27.0
13+
- hatch-vcs =0.4.0
1314
- h5py
1415
- matplotlib =3.10.0
1516
- networkx =3.4.2

.ci_support/environment-mini.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ dependencies:
55
- numpy
66
- cloudpickle =3.1.0
77
- pyzmq =26.2.0
8-
- setuptools =80.1.0
8+
- hatchling =1.27.0
9+
- hatch-vcs =0.4.0

.ci_support/environment-mpich.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ dependencies:
1212
- pygraphviz =1.14
1313
- ipython =9.0.2
1414
- pysqa =0.2.4
15-
- setuptools =80.8.0
15+
- hatchling =1.27.0
16+
- hatch-vcs =0.4.0

.ci_support/environment-old.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ dependencies:
1111
- networkx =2.8.8
1212
- ipython =7.33.0
1313
- pygraphviz =1.10
14-
- setuptools =75.1.0
14+
- hatchling =1.27.0
15+
- hatch-vcs =0.4.0

.ci_support/environment-openmpi.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ dependencies:
1212
- pygraphviz =1.14
1313
- pysqa =0.2.4
1414
- ipython =9.0.2
15-
- setuptools =80.8.0
15+
- hatchling =1.27.0
16+
- hatch-vcs =0.4.0

.ci_support/environment-win.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ dependencies:
1111
- networkx =3.4.2
1212
- pygraphviz =1.14
1313
- ipython =9.0.2
14-
- setuptools =80.8.0
14+
- hatchling =1.27.0
15+
- hatch-vcs =0.4.0

.github/workflows/deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
run: |
3333
cp .ci_support/environment-old.yml environment.yml
3434
python .ci_support/release.py; cat pyproject.toml
35-
pip install versioneer[toml]==0.29
36-
python setup.py sdist bdist_wheel
35+
git update-index --assume-unchanged pyproject.toml executorlib/_version.py
36+
hatchling build -t sdist -t wheel
3737
- name: Publish distribution 📦 to PyPI
3838
uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/pipeline.yml

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ jobs:
7474
shell: bash -l {0}
7575
timeout-minutes: 5
7676
run: |
77-
pip install versioneer[toml]==0.29
7877
pip install . --no-deps --no-build-isolation
7978
cd tests
8079
python -m unittest discover .
@@ -95,7 +94,7 @@ jobs:
9594
- name: Setup
9695
shell: bash -l {0}
9796
run: |
98-
pip install versioneer[toml]==0.29 tomlkit
97+
pip install tomlkit
9998
python .ci_support/check.py
10099
cat pyproject.toml
101100
pip install . --no-deps --no-build-isolation
@@ -129,7 +128,6 @@ jobs:
129128
shell: bash -l {0}
130129
timeout-minutes: 10
131130
run: |
132-
pip install versioneer[toml]==0.29
133131
pip install . --no-deps --no-build-isolation
134132
python tests/benchmark/llh.py static >> timing.log
135133
python tests/benchmark/llh.py process >> timing.log
@@ -161,9 +159,7 @@ jobs:
161159
environment-file: environment.yml
162160
- name: Install
163161
shell: bash -l {0}
164-
run: |
165-
pip install versioneer[toml]==0.29
166-
pip install . --no-deps --no-build-isolation
162+
run: pip install . --no-deps --no-build-isolation
167163
- name: Notebooks
168164
shell: bash -l {0}
169165
timeout-minutes: 5
@@ -190,9 +186,7 @@ jobs:
190186
environment-file: .ci_support/environment-integration.yml
191187
- name: Install
192188
shell: bash -l {0}
193-
run: |
194-
pip install versioneer[toml]==0.29
195-
pip install . --no-deps --no-build-isolation
189+
run: pip install . --no-deps --no-build-isolation
196190
- name: Notebooks
197191
shell: bash -l {0}
198192
timeout-minutes: 20
@@ -209,7 +203,7 @@ jobs:
209203
shell: bash -l {0}
210204
timeout-minutes: 5
211205
run: |
212-
echo -e '- coverage\n- flux-core =0.59.0\n- versioneer =0.28'>> .ci_support/environment-mpich.yml
206+
echo -e '- coverage\n- flux-core =0.59.0'>> .ci_support/environment-mpich.yml
213207
cat .ci_support/environment-mpich.yml
214208
echo -e "channels:\n - conda-forge\n" > .condarc
215209
- uses: conda-incubator/setup-miniconda@v3
@@ -240,7 +234,7 @@ jobs:
240234
shell: bash -l {0}
241235
timeout-minutes: 5
242236
run: |
243-
echo -e '- coverage\n- flux-core =0.59.0\n- flux-pmix=0.5.0\n- versioneer =0.28' >> .ci_support/environment-openmpi.yml
237+
echo -e '- coverage\n- flux-core =0.59.0\n- flux-pmix=0.5.0' >> .ci_support/environment-openmpi.yml
244238
cat .ci_support/environment-openmpi.yml
245239
echo -e "channels:\n - conda-forge\n" > .condarc
246240
- uses: conda-incubator/setup-miniconda@v3
@@ -303,7 +297,6 @@ jobs:
303297
shell: bash -l {0}
304298
timeout-minutes: 5
305299
run: |
306-
pip install versioneer[toml]==0.29
307300
pip install . --no-deps --no-build-isolation
308301
cd tests
309302
python -m unittest discover .
@@ -341,7 +334,6 @@ jobs:
341334
shell: bash -l {0}
342335
timeout-minutes: 5
343336
run: |
344-
pip install versioneer[toml]==0.29
345337
pip install . --no-deps --no-build-isolation
346338
cd tests
347339
python -m unittest discover .
@@ -364,7 +356,6 @@ jobs:
364356
shell: bash -l {0}
365357
timeout-minutes: 5
366358
run: |
367-
pip install versioneer[toml]==0.29
368359
pip install . --no-deps --no-build-isolation
369360
cd tests
370361
python -m unittest discover .
@@ -386,7 +377,6 @@ jobs:
386377
shell: bash -l {0}
387378
timeout-minutes: 5
388379
run: |
389-
pip install versioneer[toml]==0.29
390380
pip install . --no-deps --no-build-isolation
391381
cd tests
392382
python -m unittest discover .

.readthedocs.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ build:
1212
jobs:
1313
pre_build:
1414
# Generate the Sphinx configuration for this Jupyter Book so it builds.
15-
- pip install versioneer[toml]==0.29
1615
- pip install . --no-deps --no-build-isolation
1716
- "cp README.md docs"
1817
- "cp notebooks/*.ipynb docs"

0 commit comments

Comments
 (0)