Skip to content

Commit beaf7b2

Browse files
authored
Merge pull request #460 from hiddenSymmetries/python3.8_eol
Python3.8 EOL
2 parents ae70638 + 6b29fdf commit beaf7b2

File tree

10 files changed

+19
-20
lines changed

10 files changed

+19
-20
lines changed

.coveragerc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ relative_files = true
66
[paths]
77
sources =
88
src/
9-
/**/lib/python3.8/site-packages
109
/**/lib/python3.9/site-packages
1110
/**/lib/python3.10/site-packages
1211
/**/lib/python3.11/site-packages

.github/workflows/extensive_test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
- name: Install python dependencies
9999
run: |
100100
sudo apt-get install graphviz graphviz-dev
101-
pip install wheel "numpy<2.0.0" scipy f90nml h5py scikit-build cmake qsc sympy pyevtk matplotlib ninja plotly networkx pygraphviz ground bentley_ottmann f90wrap
101+
pip install wheel numpy scipy f90nml h5py scikit-build cmake qsc sympy pyevtk matplotlib ninja plotly networkx pygraphviz ground bentley_ottmann f90wrap
102102
103103
- name: Install booz_xform
104104
if: contains(matrix.packages, 'vmec') || contains(matrix.packages, 'all')
@@ -290,7 +290,7 @@ jobs:
290290
- name: Upload coverage to Codecov
291291
# The next line prevents github from trying to upload to Codecov on forks of the repository, avoiding a permissions error
292292
if: github.repository_owner == 'hiddenSymmetries'
293-
uses: codecov/codecov-action@v3
293+
uses: codecov/codecov-action@v4
294294
with:
295295
token: ${{ secrets.CODECOV_TOKEN }}
296296
file: ./coverage.xml

.github/workflows/linting.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ jobs:
2020
python-version: ${{ matrix.python-version }}
2121

2222
- name: Run ruff
23-
uses: chartboost/ruff-action@v1
23+
uses: astral-sh/ruff-action@v1
2424

.github/workflows/non_simd_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
- name: Install python dependencies
8585
run: |
8686
sudo apt-get install graphviz graphviz-dev
87-
pip install wheel "numpy<2.0.0" scipy f90nml h5py scikit-build cmake qsc sympy pyevtk matplotlib ninja plotly networkx pygraphviz ground bentley_ottmann
87+
pip install wheel numpy scipy f90nml h5py scikit-build cmake qsc sympy pyevtk matplotlib ninja plotly networkx pygraphviz ground bentley_ottmann
8888
8989
- name: Install booz_xform
9090
run: pip install -v git+https://github.com/hiddenSymmetries/booz_xform

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
- name: Install python dependencies
9494
run: |
9595
sudo apt-get install graphviz graphviz-dev
96-
pip install "numpy<2.0.0" cmake scikit-build f90nml ninja wheel setuptools sympy qsc pyevtk matplotlib plotly networkx pygraphviz mpi4py py_spec h5py ground bentley_ottmann f90wrap
96+
pip install numpy cmake scikit-build f90nml ninja wheel setuptools sympy qsc pyevtk matplotlib plotly networkx pygraphviz mpi4py py_spec h5py ground bentley_ottmann f90wrap
9797
9898
- name: Install pyoculus
9999
run: pip install -v git+https://github.com/zhisong/pyoculus

.github/workflows/wheel.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ jobs:
1717
run: git fetch --prune --unshallow
1818

1919
- name: Build wheels
20-
uses: pypa/cibuildwheel@v2.11.4
20+
uses: pypa/cibuildwheel@v2.21.3
2121
# To supply options, put them in 'env'
2222
env:
23-
# Only build for python 3.{8,9,10,11}
24-
CIBW_BUILD : cp38-* cp39-* cp310-* cp311-*
23+
# Only build for python 3.{9,10,11,12}
24+
CIBW_BUILD : cp39-* cp310-* cp311-* cp312-*
2525
# Supports only x86_64 arch for linux
2626
CIBW_ARCHS_LINUX: x86_64
2727
CIBW_ARCHS_MACOS: "x86_64 arm64"
28-
CIBW_SKIP: cp27-* cp36-* cp37-*
28+
CIBW_SKIP: cp27-* cp36-* cp37-* cp38-*
2929
CIBW_DEPENDENCY_VERSIONS: latest
3030

3131
- uses: actions/upload-artifact@v3
@@ -68,7 +68,7 @@ jobs:
6868
# alternatively, to publish when a GitHub Release is created, use the following rule:
6969
# if: github.event_name == 'release' && github.event.action == 'published'
7070
steps:
71-
- uses: actions/download-artifact@v4.1.7
71+
- uses: actions/download-artifact@v4
7272
with:
7373
name: artifact
7474
path: dist

ci/singularity.def

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,17 @@ Stage: devel
5050

5151
git clone --depth 1 https://github.com/mpi4py/mpi4py.git && \
5252
cd mpi4py && \
53-
/venv/bin/python setup.py build --mpicc=mpicc --mpicxx=mpicxx --mpifort=mpifort --mpif90=mpif90 --mpif77=mpif77 --mpild=mpicc && \
54-
/venv/bin/python setup.py install && \
53+
# /venv/bin/python setup.py build --mpicc=mpicc --mpicxx=mpicxx --mpifort=mpifort --mpif90=mpif90 --mpif77=mpif77 --mpild=mpicc && \
54+
# /venv/bin/python setup.py install && \
55+
/venv/bin/pip install . && \
5556
cd .. && \
5657
rm -rf mpi4py
5758

5859
git clone --depth 1 https://github.com/PrincetonUniversity/SPEC.git && \
5960
cd SPEC && \
60-
/venv/bin/python setup.py bdist_wheel && \
61-
/venv/bin/pip install -v dist/*.whl && \
61+
# /venv/bin/python setup.py bdist_wheel && \
62+
# /venv/bin/pip install -v dist/*.whl && \
63+
/venv/bin/pip install -v .
6264
cd Utilities/pythontools && \
6365
/venv/bin/pip install -r requirements.txt && \
6466
/venv/bin/pip install . && \

conda.recipe/conda_build_config.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ numpy:
22
- 1.23
33
- 1.24
44
python:
5-
- 3.8
65
- 3.9
76
- 3.10
87
- 3.11

pyproject.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
requires = [
33
"scikit-build-core",
44
"pybind11",
5-
"numpy >= 2.0.0; python_version > '3.8'",
6-
"oldest-supported-numpy; python_version <= '3.8'",
5+
"numpy >= 2.0.0",
76
"setuptools_scm>=8.0",
87
'tomli; python_version < "3.11"',]
98
build-backend = "scikit_build_core.build"
@@ -53,7 +52,7 @@ keywords = [
5352
"magnetostatics"
5453
]
5554
dependencies = [
56-
"numpy>=1.21,<2.0.0",
55+
"numpy>=1.21",
5756
"jax>=0.2.5",
5857
"jaxlib>=0.1.56",
5958
"scipy>=1.5.4",

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
setuptools_scm >= 6.0
2-
numpy >= 1.19.4
2+
numpy >= 1.21.0
33
jax >= 0.2.5
44
jaxlib >= 0.1.56
55
scipy >= 1.5.4

0 commit comments

Comments
 (0)