Skip to content

Commit 840b050

Browse files
committed
Resolve "Add official support for python 3.13"
1 parent 77b4315 commit 840b050

6 files changed

+28
-27
lines changed

.gitlab-ci.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ build-release:
2424
- if: '$CI_COMMIT_AUTHOR !~ /^CI_BOT/'
2525
parallel:
2626
matrix:
27-
- PYTHON_VERSION: ["cp38-cp38", "cp39-cp39", "cp310-cp310", "cp311-cp311", "cp312-cp312"]
27+
- PYTHON_VERSION: ["cp39-cp39", "cp310-cp310", "cp311-cp311", "cp312-cp312", "cp313-cp313"]
2828
environment: $PYTHON_VERSION
2929
script:
3030
- /opt/python/cp310-cp310/bin/python .check_version.py
@@ -44,7 +44,7 @@ build-release-macos:
4444
- macos
4545
parallel:
4646
matrix:
47-
- PYTHON_VERSION: ["cp38-cp38", "cp39-cp39", "cp310-cp310", "cp311-cp311", "cp312-cp312"]
47+
- PYTHON_VERSION: ["cp39-cp39", "cp310-cp310", "cp311-cp311", "cp312-cp312", "cp313-cp313"]
4848
environment: $PYTHON_VERSION
4949
before_script:
5050
- eval "$(pyenv init -)" && eval "$(pyenv virtualenv-init -)"
@@ -64,7 +64,7 @@ build-debug:
6464
- if: '$CI_COMMIT_AUTHOR !~ /^CI_BOT/'
6565
parallel:
6666
matrix:
67-
- PYTHON_VERSION: ["cp38-cp38", "cp39-cp39", "cp310-cp310", "cp311-cp311", "cp312-cp312"]
67+
- PYTHON_VERSION: ["cp39-cp39", "cp310-cp310", "cp311-cp311", "cp312-cp312", "cp313-cp313"]
6868
environment: $PYTHON_VERSION
6969
script:
7070
- /opt/python/cp310-cp310/bin/python .check_version.py
@@ -87,7 +87,7 @@ test-release:
8787
- build-release
8888
parallel:
8989
matrix:
90-
- PYTHON_VERSION: ["cp38-cp38", "cp39-cp39", "cp310-cp310", "cp311-cp311", "cp312-cp312"]
90+
- PYTHON_VERSION: ["cp39-cp39", "cp310-cp310", "cp311-cp311", "cp312-cp312", "cp313-cp313"]
9191
environment: $PYTHON_VERSION
9292
before_script:
9393
- /opt/python/$PYTHON_VERSION/bin/python -m pip install docov
@@ -109,7 +109,7 @@ test-release-macos:
109109
- build-release-macos
110110
parallel:
111111
matrix:
112-
- PYTHON_VERSION: ["cp38-cp38", "cp39-cp39", "cp310-cp310", "cp311-cp311", "cp312-cp312"]
112+
- PYTHON_VERSION: ["cp39-cp39", "cp310-cp310", "cp311-cp311", "cp312-cp312", "cp313-cp313"]
113113
environment: $PYTHON_VERSION
114114
before_script:
115115
- eval "$(pyenv init -)" && eval "$(pyenv virtualenv-init -)"
@@ -132,7 +132,7 @@ test-debug:
132132
- build-debug
133133
parallel:
134134
matrix:
135-
- PYTHON_VERSION: ["cp38-cp38", "cp39-cp39", "cp310-cp310", "cp311-cp311", "cp312-cp312"]
135+
- PYTHON_VERSION: ["cp39-cp39", "cp310-cp310", "cp311-cp311", "cp312-cp312", "cp313-cp313"]
136136
environment: $PYTHON_VERSION
137137
before_script:
138138
- /opt/python/$PYTHON_VERSION/bin/python -m pip install docov
@@ -152,7 +152,7 @@ test-integration-release:
152152
- build-release
153153
before_script:
154154
# for time reasons we only test the latest python version. Otherwise the tests take more than 1h.
155-
- for PY in "cp312-cp312"; do /opt/python/$PY/bin/python -m pip install docov jupyter nbconvert clickhouse-driver hagelkorn ipyparallel 'polyround[extras]'; done
155+
- for PY in "cp313-cp313"; do /opt/python/$PY/bin/python -m pip install docov jupyter nbconvert clickhouse-driver hagelkorn ipyparallel 'polyround[extras]'; done
156156
- curl https://clickhouse.com/ | sh
157157
- ./clickhouse server &> clickhouse.log &
158158
- rm examples/ParallelTemperingMPI.ipynb examples/parallel_tempering_MPI.py # mpi not compatible with manylinux
@@ -161,9 +161,9 @@ test-integration-release:
161161
- rm examples/ParallelTemperingMultiprocessing.ipynb # requires manual converting to python and the manual conversion already exists
162162
- rm examples/SamplingAdvice.ipynb # requires manual converting to python and the manual conversion already exists
163163
script:
164-
- VERSION=$(cat .version); for PY in "cp312-cp312"; do /opt/python/$PY/bin/python -m pip install dist/hopsy-$VERSION-$PY-manylinux*.whl; done
165-
- for PY in "cp312-cp312"; do for f in examples/*.py; do /opt/python/$PY/bin/python $f || exit 1; done ;done
166-
- for PY in "cp312-cp312"; do for f in examples/*.ipynb; do /opt/python/$PY/bin/python -m jupyter nbconvert --to notebook --execute $f || exit 1; done;done
164+
- VERSION=$(cat .version); for PY in "cp313-cp313"; do /opt/python/$PY/bin/python -m pip install dist/hopsy-$VERSION-$PY-manylinux*.whl; done
165+
- for PY in "cp313-cp313"; do for f in examples/*.py; do /opt/python/$PY/bin/python $f || exit 1; done ;done
166+
- for PY in "cp313-cp313"; do for f in examples/*.ipynb; do /opt/python/$PY/bin/python -m jupyter nbconvert --to notebook --execute $f || exit 1; done;done
167167
after_script:
168168
- pkill clickhouse
169169
artifacts:

.version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.5.3
1+
1.6.0

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Changelog
22

33
## Latest
4+
- [#132](https://jugit.fz-juelich.de/IBG0/ModSim/hopsy/-/issues/132): Add support for Python 3.13
45
- [#154](https://jugit.fz-juelich.de/IBG0/ModSim/hopsy/-/issues/154): Add support for numpy 2.0 and newer
56

67
## v1.5.3

makewheels.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ docker ps -a | grep hopsy_manylinux_build_env && (docker stop hopsy_manylinux_bu
66

77
docker run -d -t --name hopsy_manylinux_build_env -v $(pwd):/io quay.io/pypa/manylinux2014_x86_64
88

9-
for py in "cp38-cp38" "cp39-cp39" "cp310-cp310" "cp311-cp311" "cp312-cp312";
9+
for py in "cp39-cp39" "cp310-cp310" "cp311-cp311" "cp312-cp312" "cp313-cp313";
1010
do
1111
# docker exec hopsy_manylinux_build_env /bin/bash -c \
1212
# "/opt/python/"$py"/bin/pip install -r /io/requirements.txt"

win_makewheels.sh

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
conda activate py3.8
2-
python -m pip install -r requirements-dev.txt
3-
python -m pip uninstall --yes hopsy && python setup.py bdist_wheel
4-
python -m pip install --no-input --user dist/hopsy-1.5.3-cp38-cp38-win_amd64.whl --force-reinstall --no-deps
5-
python -c "import hopsy; print(hopsy.__version__, hopsy.__build__)"
6-
conda deactivate
71
conda activate py3.9 && python -m pip uninstall --yes hopsy
82
python -m pip install -r requirements-dev.txt
93
python setup.py bdist_wheel
10-
python -m pip install --no-input --user dist/hopsy-1.5.3-cp39-cp39-win_amd64.whl --force-reinstall --no-deps
4+
python -m pip install --no-input --user dist/hopsy-1.6.0-cp39-cp39-win_amd64.whl --force-reinstall --no-deps
115
python -c "import hopsy; print(hopsy.__version__, hopsy.__build__)"
126
conda deactivate
137
conda activate py3.10
148
python -m pip install -r requirements-dev.txt
159
python -m pip uninstall --yes hopsy
1610
python setup.py bdist_wheel
17-
python -m pip install --no-input --user dist/hopsy-1.5.3-cp310-cp310-win_amd64.whl --force-reinstall --no-deps
11+
python -m pip install --no-input --user dist/hopsy-1.6.0-cp310-cp310-win_amd64.whl --force-reinstall --no-deps
1812
python -c "import hopsy; print(hopsy.__version__, hopsy.__build__)"
1913
conda deactivate
2014
conda activate py3.11
2115
python -m pip install -r requirements-dev.txt
2216
python -m pip uninstall --yes hopsy
2317
python setup.py bdist_wheel
24-
python -m pip install --no-input --user dist/hopsy-1.5.3-cp311-cp311-win_amd64.whl --force-reinstall --no-deps
18+
python -m pip install --no-input --user dist/hopsy-1.6.0-cp311-cp311-win_amd64.whl --force-reinstall --no-deps
2519
python -c "import hopsy; print(hopsy.__version__, hopsy.__build__)"
2620
conda deactivate
2721
conda activate py3.12
2822
python -m pip install -r requirements-dev.txt
2923
python -m pip uninstall --yes hopsy
3024
python setup.py bdist_wheel
31-
python -m pip install --no-input --user dist/hopsy-1.5.3-cp312-cp312-win_amd64.whl --force-reinstall --no-deps
25+
python -m pip install --no-input --user dist/hopsy-1.6.0-cp312-cp312-win_amd64.whl --force-reinstall --no-deps
26+
python -c "import hopsy; print(hopsy.__version__, hopsy.__build__)"
27+
conda deactivate
28+
conda activate py3.13
29+
python -m pip install -r requirements-dev.txt
30+
python -m pip uninstall --yes hopsy && python setup.py bdist_wheel
31+
python -m pip install --no-input --user dist/hopsy-1.6.0-cp3138-cp313-win_amd64.whl --force-reinstall --no-deps
3232
python -c "import hopsy; print(hopsy.__version__, hopsy.__build__)"
3333
conda deactivate

win_testwheels.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
conda activate py3.8
2-
python --version
3-
python -c "import hopsy; print(hopsy.__version__, hopsy.__build__)"
4-
python -m unittest tests
5-
conda deactivate
61
conda activate py3.9
72
python --version
83
python -c "import hopsy; print(hopsy.__version__, hopsy.__build__)"
@@ -23,3 +18,8 @@ python --version
2318
python -c "import hopsy; print(hopsy.__version__, hopsy.__build__)"
2419
python -m unittest tests
2520
conda deactivate
21+
conda activate py3.13
22+
python --version
23+
python -c "import hopsy; print(hopsy.__version__, hopsy.__build__)"
24+
python -m unittest tests
25+
conda deactivate

0 commit comments

Comments
 (0)