Skip to content

Commit

Permalink
Merge pull request #177 from punch-mission/bump-python-version
Browse files Browse the repository at this point in the history
Bumps Python version to 3.10
  • Loading branch information
jmbhughes authored Jun 3, 2024
2 parents e10f678 + 3dd1261 commit 67cbf7d
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 38 deletions.
12 changes: 4 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.9"]
python-version: ["3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v3
Expand All @@ -31,14 +31,10 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install flake8 pytest pytest-cov hypothesis
if [ -f requirements_dev.txt ]; then pip install -r requirements_dev.txt; fi
- name: Lint with flake8
pip install ".[test]"
- name: Lint with ruff
run: |
# stop the build if there are Python syntax errors or undefined names
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
ruff check .
- name: Test with pytest
run: |
pip install .
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Install dependencies
run: |
pip install -r ./docs/requirements.txt
pip install -r requirements.txt
pip install ".[test]"
python setup.py build_ext --inplace
# Build the book
Expand Down
9 changes: 0 additions & 9 deletions requirements.txt

This file was deleted.

16 changes: 0 additions & 16 deletions requirements_dev.txt

This file was deleted.

14 changes: 10 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

setup(
name="regularizepsf",
python_requires=">=3.9",
version="0.3.2",
python_requires=">=3.10",
version="0.3.3",
description="Point spread function modeling and regularization",
long_description=long_description,
long_description_content_type="text/markdown",
Expand All @@ -22,8 +22,14 @@
author="J. Marcus Hughes",
author_email="hughes.jmb@gmail.com",
ext_modules=cythonize(ext_modules, annotate=True, compiler_directives={"language_level": 3}),
install_requires=["numpy", "dill", "h5py", "lmfit", "sep", "cython", "astropy", "scipy", "scikit-image", "matplotlib"],
install_requires=["numpy", "dill", "h5py", "lmfit", "sep", "cython", "astropy", "scipy", "scikit-image", "matplotlib", "setuptools"],
package_data={"regularizepsf": ["helper.pyx"]},
setup_requires=["cython"],
extras_require={"test": ["pytest", "coverage", "pytest-runner", "pytest-mpl"]}
extras_require={"test": ["pytest",
"pytest-cov",
"pytest-runner",
"hypothesis",
"ruff",
"pytest-mpl",
"pre-commit"]}
)

0 comments on commit 67cbf7d

Please sign in to comment.