Skip to content

Commit

Permalink
Merge pull request #524 from larrybradley/packaging
Browse files Browse the repository at this point in the history
Misc infrastructure updates
  • Loading branch information
larrybradley authored Sep 19, 2023
2 parents 7fefed4 + f540464 commit 4714151
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 20 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ jobs:

- os: ubuntu-latest
python: '3.10'
tox_env: 'py310-test-alldeps-cov'
toxposargs: --remote-data=any
tox_env: 'py310-test-alldeps'
allow_failure: false
prefix: ''

- os: ubuntu-latest
python: '3.11'
tox_env: 'py311-test-alldeps'
tox_env: 'py311-test-alldeps-cov'
toxposargs: --remote-data=any
allow_failure: false
prefix: ''

Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:

- os: ubuntu-latest
python: '3.9'
tox_env: 'py39-test-alldeps-astropylts-numpy122'
tox_env: 'py39-test-oldestdeps'
allow_failure: false
prefix: ''

Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ on:
schedule:
# run every Monday at 5am UTC
- cron: '0 5 * * 1'
pull_request:
# We also want this workflow triggered if the 'Build all wheels'
# label is added or present when PR is updated
types:
- synchronize
- labeled
push:
branches:
- '*'
Expand All @@ -12,9 +18,6 @@ on:
- '!*dev*'
- '!*pre*'
- '!*post*'
# allow manual wheel building with a PR label
pull_request:
# allow manual wheel building from the Actions UI
workflow_dispatch:

permissions:
Expand Down
9 changes: 3 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ dependencies = [
]

[project.urls]
homepage = 'https://github.com/astropy/regions'
documentation = 'https://astropy-regions.readthedocs.io/en/stable/'
Homepage = 'https://github.com/astropy/regions'
Documentation = 'https://astropy-regions.readthedocs.io/en/stable/'

[project.optional-dependencies]
all = [
Expand All @@ -53,8 +53,7 @@ requires = [
'setuptools>=61.2',
'setuptools_scm>=6.2',
'cython>=0.29.36',
'numpy<1.26.0b1; python_version<"3.12"',
'numpy>=1.26.0b1; python_version>="3.12"',
'numpy',
'extension-helpers',
]
build-backend = 'setuptools.build_meta'
Expand Down Expand Up @@ -115,8 +114,6 @@ filterwarnings = [
'ignore:numpy.ndarray size changed:RuntimeWarning',
'ignore:unclosed file:ResourceWarning',
'ignore:distutils Version classes are deprecated:DeprecationWarning',
# TEMP: remove when matplotlib nightly fixes the row_stack deprecations
'ignore:`row_stack` alias is deprecated:DeprecationWarning',
]
markers = [
'array_compare'
Expand Down
10 changes: 3 additions & 7 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
[tox]
envlist =
py{39,310,311}-test{,-alldeps,-devdeps,-oldestdeps,-devinfra}{,-cov}
py{39,310,311}-test-numpy{122,123,124,125}
py{39,310,311}-test-astropy{50,lts}
py{39,310,311}-test-numpy{122,123,124,125,126}
build_docs
linkcheck
codestyle
Expand Down Expand Up @@ -48,8 +47,7 @@ description =
numpy123: with numpy 1.23.*
numpy124: with numpy 1.24.*
numpy125: with numpy 1.25.*
astropy50: with astropy 5.0.*
astropylts: with the latest astropy LTS
numpy126: with numpy 1.26.*
casa: with casatools and casatasks

# The following provides some specific pinnings for key packages
Expand All @@ -60,9 +58,7 @@ deps =
numpy123: numpy==1.23.*
numpy124: numpy==1.24.*
numpy125: numpy==1.25.*

astropy50: astropy==5.0.*
astropylts: astropy==5.0.*
numpy126: numpy==1.26.*

casa: :NRAO:casatools
casa: :NRAO:casatasks
Expand Down

0 comments on commit 4714151

Please sign in to comment.