Skip to content

Commit cfa603d

Browse files
authored
Infrastructure update (#427)
* Infrastructure update: remove sbpy.cfg, remove astropy testrunner * Only want one copy of our license * Add astropy license * Update copyright year * Fix github url * Edit description * Logo refresh. * Update sphinx configuration to use pyproject.toml and compile with current astropy * Update os and python version in readthedocs config * Disable pyoorb testing for now. * Better handling of compile_fieldnames.py * Re-add version.py to gitignore * Remove numpy126 from CI envs and take out more oorb * Switch to macos-latest * Comment fixes in CI files * Remove vestigial remnants of setup.cfg * Revert "Re-add version.py to gitignore" This reverts commit a5903e2. * Update handling of version * Print values in doctests to avoid np.float64(...) * Straighten out numpy versions * Typing updates: drop Union and clean up use of Self * Update dev notes * Also doctest units; order should be stable since astropy 5.3 * Mimic astropy's coverage setup * Fix escape character on Delta * Document **kwargs as dict * Try to avoid sphinx warning on **kwargs * Tell coverage where the coverage options are defined * With pytest-doctestplus 1.6 we can try double directives * Revert "With pytest-doctestplus 1.6 we can try double directives" This reverts commit 4144014. * Update change log * Version bump doctestplus so we can serialize directives! * Remove duplicated lines.
1 parent 162139f commit cfa603d

59 files changed

Lines changed: 1702 additions & 2164 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci_cron_weekly.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# GitHub Actions workflow that runs on a cron schedule.
22
# Check URLs and run latest deps with remote tests
33

4-
# Remove -numpy126 when we support testing with numpy 2.0
4+
# Restore testing with pyoorb when it supports Python 3.12+
55

66
name: Weekly CI Tests
77

@@ -19,10 +19,10 @@ env:
1919
IS_CRON: "true"
2020

2121
jobs:
22-
oorb-data:
23-
uses: ./.github/workflows/oorb_data.yml
22+
# oorb-data:
23+
# uses: ./.github/workflows/oorb_data.yml
2424
tests:
25-
needs: [oorb-data]
25+
# needs: [oorb-data]
2626
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
2727
secrets:
2828
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
@@ -31,23 +31,23 @@ jobs:
3131
ARCH_ON_CI: "normal"
3232
IS_CRON: "true"
3333
OORB_DATA: "$GITHUB_WORKSPACE/oorb-data/"
34-
cache-path: oorb-data/
35-
cache-key: oorb-data
34+
# cache-path: oorb-data/
35+
# cache-key: oorb-data
3636
submodules: false
3737
coverage: ""
3838
envs: |
3939
- name: Link check
4040
linux: linkcheck
4141
42-
- name: Python 3.13 with dev versions of key dependencies
43-
linux: py313-test-devdeps-cov
42+
- name: Python 3.14 with dev versions of key dependencies
43+
linux: py314-test-devdeps-cov
4444
posargs: --verbose
4545
4646
allowed_failures:
4747
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
4848
with:
4949
submodules: false
5050
envs: |
51-
- name: Python 3.11 with all optional dependencies and remote data
52-
linux: py311-test-numpy126-alldeps
51+
- name: Python 3.14 with all optional dependencies and remote data
52+
linux: py314-test-alldeps
5353
posargs: --remote-data --verbose

.github/workflows/ci_tests.yml

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
#
33
# This file performs testing using tox and tox.ini to define and configure the test environments.
44

5-
# Remove -numpy126 when we support testing with numpy 2.0
6-
# Allow testing of optional dependencies on Python 3.12+ when pyoorb is updated.
5+
# Restore testing with pyoorb when it supports Python 3.12+
76

87
name: CI Tests
98

@@ -26,10 +25,10 @@ env:
2625
IS_CRON: "false"
2726

2827
jobs:
29-
oorb-data:
30-
uses: ./.github/workflows/oorb_data.yml
28+
# oorb-data:
29+
# uses: ./.github/workflows/oorb_data.yml
3130
tests:
32-
needs: [oorb-data]
31+
# needs: [oorb-data]
3332
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
3433
secrets:
3534
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
@@ -38,47 +37,47 @@ jobs:
3837
ARCH_ON_CI: "normal"
3938
IS_CRON: "false"
4039
OORB_DATA: "$GITHUB_WORKSPACE/oorb-data/"
41-
cache-path: oorb-data/
42-
cache-key: oorb-data
40+
# cache-path: oorb-data/
41+
# cache-key: oorb-data
4342
submodules: false
4443
coverage: ""
4544
envs: |
4645
- name: Code style checks
4746
linux: codestyle
4847
49-
- name: Python 3.13 with minimal dependencies, measuring coverage
50-
linux: py313-test-cov
48+
- name: Python 3.14 with minimal dependencies, measuring coverage
49+
linux: py314-test-cov
5150
coverage: codecov
5251
53-
- name: Python 3.11 with all optional dependencies, measuring coverage
54-
linux: py311-test-numpy126-alldeps-cov
52+
- name: Python 3.14 with all optional dependencies, measuring coverage
53+
linux: py314-test-alldeps-cov
5554
coverage: codecov
5655
57-
- name: Python 3.9 with oldest supported versions, measuring coverage
58-
linux: py39-test-oldestdeps-cov
56+
- name: Python 3.10 with oldest supported versions, measuring coverage
57+
linux: py310-test-oldestdeps-cov
5958
coverage: codecov
6059
macos-test:
61-
name: Python 3.11 with all optional dependencies (MacOS)
62-
needs: [oorb-data]
63-
runs-on: macos-13
60+
name: Python 3.14 with all optional dependencies (MacOS)
61+
# needs: [oorb-data]
62+
runs-on: macos-latest
6463
steps:
6564
- name: Checkout repository
6665
uses: actions/checkout@v4
67-
- name: Restore cached files
68-
uses: actions/cache/restore@v4
69-
with:
70-
path: oorb-data/
71-
key: oorb-data
72-
- name: Set environment
73-
run: |
74-
echo "OORB_DATA=$GITHUB_WORKSPACE/oorb-data" >> "$GITHUB_ENV"
66+
# - name: Restore cached files
67+
# uses: actions/cache/restore@v4
68+
# with:
69+
# path: oorb-data/
70+
# key: oorb-data
71+
# - name: Set environment
72+
# run: |
73+
# echo "OORB_DATA=$GITHUB_WORKSPACE/oorb-data" >> "$GITHUB_ENV"
7574
- name: Set up Python
7675
uses: actions/setup-python@v5
7776
with:
78-
python-version: 3.11
77+
python-version: 3.14
7978
- name: Install tox
8079
run: |
8180
pip install tox
8281
- name: Run tests
8382
run: |
84-
tox -e py311-test-numpy126-alldeps
83+
tox -e py314-test-alldeps

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ __pycache__
1010
*.c
1111

1212
# Other generated files
13-
sbpy/version.py
1413
sbpy/_version.py
1514
*/cython_version.py
1615
htmlcov

.readthedocs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
version: 2
66

77
build:
8-
os: ubuntu-20.04
8+
os: ubuntu-24.04
99
tools:
10-
python: "3.10"
10+
python: "3.13"
1111
apt_packages:
1212
- graphviz
1313
jobs:

CHANGES.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
v0.7.0 (unreleased)
2+
===================
3+
4+
Update supported versions [#427]:
5+
- Python >= 3.10
6+
7+
18
v0.6.0 (2025-12-02)
29
===================
310

LICENSE.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2017-2024, sbpy team
1+
Copyright (c) 2017-2025, sbpy team
22
All rights reserved.
33

44
sbpy uses a 3-Clause BSD License:

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
include README.rst
22
include CHANGES.rst
3-
include setup.cfg
43
include LICENSE.rst
54
include pyproject.toml
65

@@ -12,6 +11,7 @@ recursive-include docs *
1211
recursive-include licenses *
1312
recursive-include scripts *
1413

14+
prune sbpy/_dev
1515
prune build
1616
prune docs/_build
1717
prune docs/api

docs/_static/sbpy_banner_96.png

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../logo/sbpy_banner_96.png
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../logo/sbpy_banner_dark_96.png

docs/_static/sbpy_logo.ico

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../logo/sbpy_logo.ico

0 commit comments

Comments
 (0)