Skip to content

Commit 67cbf7d

Browse files
authored
Merge pull request #177 from punch-mission/bump-python-version
Bumps Python version to 3.10
2 parents e10f678 + 3dd1261 commit 67cbf7d

File tree

5 files changed

+15
-38
lines changed

5 files changed

+15
-38
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
python-version: ["3.9"]
23+
python-version: ["3.10", "3.11", "3.12"]
2424

2525
steps:
2626
- uses: actions/checkout@v3
@@ -31,14 +31,10 @@ jobs:
3131
- name: Install dependencies
3232
run: |
3333
python -m pip install --upgrade pip
34-
python -m pip install flake8 pytest pytest-cov hypothesis
35-
if [ -f requirements_dev.txt ]; then pip install -r requirements_dev.txt; fi
36-
- name: Lint with flake8
34+
pip install ".[test]"
35+
- name: Lint with ruff
3736
run: |
38-
# stop the build if there are Python syntax errors or undefined names
39-
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
40-
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
41-
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
37+
ruff check .
4238
- name: Test with pytest
4339
run: |
4440
pip install .

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Install dependencies
2323
run: |
2424
pip install -r ./docs/requirements.txt
25-
pip install -r requirements.txt
25+
pip install ".[test]"
2626
python setup.py build_ext --inplace
2727
2828
# Build the book

requirements.txt

Lines changed: 0 additions & 9 deletions
This file was deleted.

requirements_dev.txt

Lines changed: 0 additions & 16 deletions
This file was deleted.

setup.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
setup(
1313
name="regularizepsf",
14-
python_requires=">=3.9",
15-
version="0.3.2",
14+
python_requires=">=3.10",
15+
version="0.3.3",
1616
description="Point spread function modeling and regularization",
1717
long_description=long_description,
1818
long_description_content_type="text/markdown",
@@ -22,8 +22,14 @@
2222
author="J. Marcus Hughes",
2323
author_email="hughes.jmb@gmail.com",
2424
ext_modules=cythonize(ext_modules, annotate=True, compiler_directives={"language_level": 3}),
25-
install_requires=["numpy", "dill", "h5py", "lmfit", "sep", "cython", "astropy", "scipy", "scikit-image", "matplotlib"],
25+
install_requires=["numpy", "dill", "h5py", "lmfit", "sep", "cython", "astropy", "scipy", "scikit-image", "matplotlib", "setuptools"],
2626
package_data={"regularizepsf": ["helper.pyx"]},
2727
setup_requires=["cython"],
28-
extras_require={"test": ["pytest", "coverage", "pytest-runner", "pytest-mpl"]}
28+
extras_require={"test": ["pytest",
29+
"pytest-cov",
30+
"pytest-runner",
31+
"hypothesis",
32+
"ruff",
33+
"pytest-mpl",
34+
"pre-commit"]}
2935
)

0 commit comments

Comments
 (0)