Skip to content

Commit

Permalink
Merge pull request #321 from Cadair/0.9
Browse files Browse the repository at this point in the history
Prepare a 0.9.1 release with support for 3.11
  • Loading branch information
Cadair authored Oct 28, 2022
2 parents 9e4903f + 3ffdc8f commit 17904c6
Show file tree
Hide file tree
Showing 8 changed files with 75 additions and 14 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/ci_workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,13 @@ jobs:
- linux: py38-test
- linux: py39-test
- linux: py310-test
- linux: py311-test-devdeps
- windows: py38-test-oldestdeps
- windows: py39-test
- windows: py310-test
libraries: |
apt:
- libopenblas-dev
coverage: 'codecov'

publish:
Expand All @@ -38,6 +42,6 @@ jobs:
- cp*-manylinux_aarch64
- cp*-macosx_x86_64
- cp*-macosx_arm64
- cp*-win*
- cp*-win_amd64
secrets:
pypi_token: ${{ secrets.pypi_token }}
55 changes: 55 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
hooks:
- id: check-added-large-files
- id: check-case-conflict
- id: check-yaml
- id: debug-statements
- id: end-of-file-fixer
exclude: ".*(data.*|extern.*|licenses.*|.*.fits)$"
- id: trailing-whitespace
exclude: ".*(data.*|extern.*|licenses.*|.*.fits)$"

# We list the warnings/errors to check for here rather than in setup.cfg because
# we don't want these options to apply whenever anyone calls flake8 from the
# command-line or their code editor - in this case all warnings/errors should be
# checked for. The warnings/errors we check for here are:
# E101 - mix of tabs and spaces
# W191 - use of tabs
# E201 - whitespace after '('
# E202 - whitespace before ')'
# W291 - trailing whitespace
# W292 - no newline at end of file
# W293 - trailing whitespace
# W391 - blank line at end of file
# E111 - 4 spaces per indentation level
# E112 - 4 spaces per indentation level
# E113 - 4 spaces per indentation level
# E301 - expected 1 blank line, found 0
# E302 - expected 2 blank lines, found 0
# E303 - too many blank lines (3)
# E304 - blank lines found after function decorator
# E305 - expected 2 blank lines after class or function definition
# E306 - expected 1 blank line before a nested definition
# E502 - the backslash is redundant between brackets
# E722 - do not use bare except
# E901 - SyntaxError or IndentationError
# E902 - IOError
# E999: SyntaxError -- failed to compile a file into an Abstract Syntax Tree
# F822: undefined name in __all__
# F823: local variable name referenced before assignment
- repo: https://github.com/PyCQA/flake8
rev: 5.0.4
hooks:
- id: flake8
args:
[
"--count",
"--select",
"E101,W191,E201,E202,W291,W292,W293,W391,E111,E112,E113,E30,E502,E722,E901,E902,E999,F822,F823",
]
exclude: ".*(data.*|extern.*|cextern)$"

ci:
autofix_prs: false
2 changes: 1 addition & 1 deletion docs/_templates/autosummary/base.rst
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{% extends "autosummary_core/base.rst" %}
{# The template this is inherited from is in astropy/sphinx/ext/templates/autosummary_core. If you want to modify this template, it is strongly recommended that you still inherit from the astropy template. #}
{# The template this is inherited from is in astropy/sphinx/ext/templates/autosummary_core. If you want to modify this template, it is strongly recommended that you still inherit from the astropy template. #}
2 changes: 1 addition & 1 deletion docs/_templates/autosummary/class.rst
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{% extends "autosummary_core/class.rst" %}
{# The template this is inherited from is in astropy/sphinx/ext/templates/autosummary_core. If you want to modify this template, it is strongly recommended that you still inherit from the astropy template. #}
{# The template this is inherited from is in astropy/sphinx/ext/templates/autosummary_core. If you want to modify this template, it is strongly recommended that you still inherit from the astropy template. #}
2 changes: 1 addition & 1 deletion docs/_templates/autosummary/module.rst
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{% extends "autosummary_core/module.rst" %}
{# The template this is inherited from is in astropy/sphinx/ext/templates/autosummary_core. If you want to modify this template, it is strongly recommended that you still inherit from the astropy template. #}
{# The template this is inherited from is in astropy/sphinx/ext/templates/autosummary_core. If you want to modify this template, it is strongly recommended that you still inherit from the astropy template. #}
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ requires = ["setuptools",
"wheel",
"extension-helpers",
"oldest-supported-numpy",
"cython==0.29.21"]
"cython==0.29.32"]
build-backend = 'setuptools.build_meta'

[tool.cibuildwheel]
skip = "cp36-* pp* *-musllinux* cp310-win32"
test-skip = "*-macosx_arm64 *-manylinux_aarch64"
6 changes: 5 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = reproject
author = Thomas Robitaille, Christoph Deil, Adam Ginsburg
author_email = thomas.robitaille@gmail.com
license = BSD 3-Clause
license_file = LICENSE
license_files = LICENSE
url = https://reproject.readthedocs.io
description = Reproject astronomical images
long_description = file: README.rst
Expand Down Expand Up @@ -60,6 +60,10 @@ filterwarnings =
ignore:No observer defined on WCS:astropy.utils.exceptions.AstropyUserWarning
ignore:unclosed file:ResourceWarning
ignore:The conversion of these 2D helioprojective coordinates to 3D is all NaNs
# This is a sunpy < 4.1 issue with Python 3.11
ignore:'xdrlib' is deprecated and slated for removal in Python 3.13
# This is a pyvo issue with Python 3.11
ignore:'cgi' is deprecated and slated for removal in Python 3.13

[coverage:run]
omit =
Expand Down
13 changes: 5 additions & 8 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
[tox]
envlist =
py{37,38,39,310}-{test}{-oldestdeps,-numpy121}
py{37,38,39,310,311}-{test}{-oldestdeps,-numpy121}
build_docs
codestyle
isolated_build = True
indexserver =
NIGHTLY = https://pypi.anaconda.org/scipy-wheels-nightly/simple
ASTROPY = https://pkgs.dev.azure.com/astropy-project/astropy/_packaging/nightly/pypi/simple/

[testenv]
whitelist_externals =
Expand All @@ -16,7 +13,7 @@ passenv =
setenv =
HOME = {envtmpdir}
MPLBACKEND = Agg
PYTEST_COMMAND = pytest --arraydiff --arraydiff-default-format=fits --pyargs reproject --cov reproject --cov-config={toxinidir}/setup.cfg {toxinidir}/docs
PYTEST_COMMAND = pytest --arraydiff --arraydiff-default-format=fits --pyargs reproject --cov reproject --cov-config={toxinidir}/setup.cfg {toxinidir}/docs
changedir =
.tmp/{envname}
deps =
Expand All @@ -27,9 +24,9 @@ deps =
oldestdeps: astropy-healpix==0.6
oldestdeps: scipy==1.3.2

devdeps: :NIGHTLY:numpy
devdeps: :NIGHTLY:scipy
devdeps: :ASTROPY:astropy
devdeps: numpy>=0.0.dev0
devdeps: scipy>=0.0.dev0
devdeps: astropy>=0.0.dev0
devdeps: git+https://github.com/asdf-format/asdf.git#egg=asdf
devdeps: git+https://github.com/astropy/asdf-astropy.git
devdeps: git+https://github.com/spacetelescope/gwcs.git#egg=gwcs
Expand Down

0 comments on commit 17904c6

Please sign in to comment.