Skip to content

Commit

Permalink
Merge pull request #1099 from glotzerlab/fix/update-python-support
Browse files Browse the repository at this point in the history
Drop python 3.6
  • Loading branch information
tommy-waltmann committed May 1, 2023
2 parents 9c35778 + 8fd746d commit 577da5c
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-20.04, macos-12] #, windows-2019]
pyver: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v3.5.0
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/cibuildwheel-before-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,9 @@ fi

PACKAGE_DIR=$1

if [[ $(python --version 2>&1) == *"3.6."* ]]; then
# Python 3.6 is only supported with oldest requirements
if [[ $(python --version 2>&1) == *"3.7."* ]]; then
# Python 3.7 is only supported with oldest requirements
pip install -U -r "${PACKAGE_DIR}/.github/workflows/oldest-test-reqs.txt" --progress-bar=off
elif [[ $(python --version 2>&1) == *"3.7."* ]]; then
# Python 3.7 was dropped by NEP 29 so not compatible with some of the newest dependencies
pip install -U -r "${PACKAGE_DIR}/requirements/requirements-test-compatible.txt" --progress-bar=off
else
pip install -U -r "${PACKAGE_DIR}/requirements/requirements-test.txt" --progress-bar=off
fi
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/oldest-test-reqs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dynasor==1.1b0; platform_system != "Windows"
garnett==0.7.1
gsd==2.4.2
matplotlib==3.0.0
numpy==1.14.0
numpy==1.15.0
pillow==6.2.0
pytest==6.2.2
rowan==1.2.1
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ jobs:
strategy:
matrix:
os: [macOS-latest, ubuntu-latest, windows-latest]
pyver-env: [ {pyver: '3.6', env: 'test-oldest_env.yaml'},
{pyver: '3.7', env: 'test-compatible_env.yaml'},
pyver-env: [ {pyver: '3.7', env: 'test-oldest_env.yaml'},
{pyver: '3.8', env: 'test_env.yaml'},
{pyver: '3.9', env: 'test_env.yaml'},
{pyver: '3.10', env: 'test_env.yaml'},
Expand Down
3 changes: 3 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ and this project adheres to
### Fixed
* Neighborlists generated by certain compute objects now exist after the compute object is garbage collected.

### Removed
* Support for Python 3.6

## v2.12.1 -- 2022-12-05

### Added
Expand Down
2 changes: 1 addition & 1 deletion doc/source/gettingstarted/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Compile from source
The following are **required** for building and installing **freud** from source:

- A C++17-compliant compiler
- `Python <https://www.python.org/>`__ (>=3.6)
- `Python <https://www.python.org/>`__ (>=3.7)
- `NumPy <https://www.numpy.org/>`__ (>=1.14)
- `Intel Threading Building Blocks <https://www.threadingbuildingblocks.org/>`__ (>=2019.7)
- `Cython <https://cython.org/>`__ (>=0.29.14)
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["setuptools", "wheel", "oldest-supported-numpy", "cython>=0.29.14", "scikit-build>=0.13.1", "cmake"]
requires = ["setuptools", "wheel", "oldest-supported-numpy", "cython>=0.29.14", "scikit-build==0.17.1", "cmake"]

[tool.black]
target-version = ['py36']
Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
"Topic :: Scientific/Engineering :: Physics",
"Programming Language :: C++",
"Programming Language :: Cython",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
Expand All @@ -57,7 +56,7 @@
"Source Code": "https://github.com/glotzerlab/freud",
"Issue Tracker": "https://github.com/glotzerlab/freud/issues",
},
python_requires=">=3.6",
python_requires=">=3.7",
install_requires=[
"numpy>=1.14",
"rowan>=1.2.1",
Expand Down

0 comments on commit 577da5c

Please sign in to comment.