Skip to content

Commit

Permalink
Merge pull request #460 from hiddenSymmetries/python3.8_eol
Browse files Browse the repository at this point in the history
Python3.8 EOL
  • Loading branch information
mbkumar authored Nov 22, 2024
2 parents ae70638 + 6b29fdf commit beaf7b2
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 20 deletions.
1 change: 0 additions & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ relative_files = true
[paths]
sources =
src/
/**/lib/python3.8/site-packages
/**/lib/python3.9/site-packages
/**/lib/python3.10/site-packages
/**/lib/python3.11/site-packages
4 changes: 2 additions & 2 deletions .github/workflows/extensive_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
- name: Install python dependencies
run: |
sudo apt-get install graphviz graphviz-dev
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
pip install wheel numpy scipy f90nml h5py scikit-build cmake qsc sympy pyevtk matplotlib ninja plotly networkx pygraphviz ground bentley_ottmann f90wrap
- name: Install booz_xform
if: contains(matrix.packages, 'vmec') || contains(matrix.packages, 'all')
Expand Down Expand Up @@ -290,7 +290,7 @@ jobs:
- name: Upload coverage to Codecov
# The next line prevents github from trying to upload to Codecov on forks of the repository, avoiding a permissions error
if: github.repository_owner == 'hiddenSymmetries'
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: ./coverage.xml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ jobs:
python-version: ${{ matrix.python-version }}

- name: Run ruff
uses: chartboost/ruff-action@v1
uses: astral-sh/ruff-action@v1

2 changes: 1 addition & 1 deletion .github/workflows/non_simd_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
- name: Install python dependencies
run: |
sudo apt-get install graphviz graphviz-dev
pip install wheel "numpy<2.0.0" scipy f90nml h5py scikit-build cmake qsc sympy pyevtk matplotlib ninja plotly networkx pygraphviz ground bentley_ottmann
pip install wheel numpy scipy f90nml h5py scikit-build cmake qsc sympy pyevtk matplotlib ninja plotly networkx pygraphviz ground bentley_ottmann
- name: Install booz_xform
run: pip install -v git+https://github.com/hiddenSymmetries/booz_xform
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
- name: Install python dependencies
run: |
sudo apt-get install graphviz graphviz-dev
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
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
- name: Install pyoculus
run: pip install -v git+https://github.com/zhisong/pyoculus
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/wheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ jobs:
run: git fetch --prune --unshallow

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

- uses: actions/upload-artifact@v3
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
# alternatively, to publish when a GitHub Release is created, use the following rule:
# if: github.event_name == 'release' && github.event.action == 'published'
steps:
- uses: actions/download-artifact@v4.1.7
- uses: actions/download-artifact@v4
with:
name: artifact
path: dist
Expand Down
10 changes: 6 additions & 4 deletions ci/singularity.def
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,17 @@ Stage: devel

git clone --depth 1 https://github.com/mpi4py/mpi4py.git && \
cd mpi4py && \
/venv/bin/python setup.py build --mpicc=mpicc --mpicxx=mpicxx --mpifort=mpifort --mpif90=mpif90 --mpif77=mpif77 --mpild=mpicc && \
/venv/bin/python setup.py install && \
# /venv/bin/python setup.py build --mpicc=mpicc --mpicxx=mpicxx --mpifort=mpifort --mpif90=mpif90 --mpif77=mpif77 --mpild=mpicc && \
# /venv/bin/python setup.py install && \
/venv/bin/pip install . && \
cd .. && \
rm -rf mpi4py

git clone --depth 1 https://github.com/PrincetonUniversity/SPEC.git && \
cd SPEC && \
/venv/bin/python setup.py bdist_wheel && \
/venv/bin/pip install -v dist/*.whl && \
# /venv/bin/python setup.py bdist_wheel && \
# /venv/bin/pip install -v dist/*.whl && \
/venv/bin/pip install -v .
cd Utilities/pythontools && \
/venv/bin/pip install -r requirements.txt && \
/venv/bin/pip install . && \
Expand Down
1 change: 0 additions & 1 deletion conda.recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ numpy:
- 1.23
- 1.24
python:
- 3.8
- 3.9
- 3.10
- 3.11
Expand Down
5 changes: 2 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
requires = [
"scikit-build-core",
"pybind11",
"numpy >= 2.0.0; python_version > '3.8'",
"oldest-supported-numpy; python_version <= '3.8'",
"numpy >= 2.0.0",
"setuptools_scm>=8.0",
'tomli; python_version < "3.11"',]
build-backend = "scikit_build_core.build"
Expand Down Expand Up @@ -53,7 +52,7 @@ keywords = [
"magnetostatics"
]
dependencies = [
"numpy>=1.21,<2.0.0",
"numpy>=1.21",
"jax>=0.2.5",
"jaxlib>=0.1.56",
"scipy>=1.5.4",
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
setuptools_scm >= 6.0
numpy >= 1.19.4
numpy >= 1.21.0
jax >= 0.2.5
jaxlib >= 0.1.56
scipy >= 1.5.4
Expand Down

0 comments on commit beaf7b2

Please sign in to comment.