Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump python version #257

Merged
merged 6 commits into from
Jun 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 23 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
toxdeps: tox-pypi-filter
posargs: -n auto
envs: |
- linux: py311
- linux: py312

test:
needs: [core]
Expand All @@ -38,8 +38,8 @@ jobs:
toxdeps: tox-pypi-filter
posargs: -n auto
envs: |
- windows: py39
- macos: py310
- windows: py310
- macos: py311

docs:
needs: [core]
Expand All @@ -55,6 +55,24 @@ jobs:
envs: |
- linux: build_docs

cron:
if: |
github.event_name == 'workflow_dispatch' || (
github.event_name == 'pull_request' &&
contains(github.event.pull_request.labels.*.name, 'Run cron CI')
)
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@main
with:
default_python: '3.12'
submodules: false
coverage: codecov
toxdeps: tox-pypi-filter
posargs: -n auto --color=yes
envs: |
- linux: py312-devdeps
secrets:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

online:
if: "!startsWith(github.event.ref, 'refs/tags/v')"
needs: [docs]
Expand All @@ -65,7 +83,7 @@ jobs:
toxdeps: tox-pypi-filter
posargs: -n 1 --dist loadgroup
envs: |
- linux: py311-online
- linux: py312-online

publish:
if: |
Expand All @@ -81,7 +99,7 @@ jobs:
needs: [test]
uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@main
with:
python-version: "3.9"
python-version: "3.12"
test_extras: 'dev'
test_command: 'pytest -p no:warnings --doctest-rst -m "not mpl_image_compare" --pyargs sunraster'
submodules: false
Expand Down
23 changes: 0 additions & 23 deletions .github/workflows/draft-pdf.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repos:
args: ['--in-place', '--remove-all-unused-imports', '--remove-unused-variable']
exclude: ".*(.fits|.fts|.fit|.txt|tca.*|extern.*|.rst|.md|__init__.py|docs/conf.py)$"
- repo: https://github.com/psf/black
rev: 24.3.0
rev: 24.4.2
hooks:
- id: black
exclude: ".*(.fits|.fts|.fit|.txt|.csv)$"
Expand All @@ -16,7 +16,7 @@ repos:
- id: isort
exclude: ".*(.fits|.fts|.fit|.txt|.csv)$"
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
rev: v4.6.0
hooks:
- id: check-ast
- id: check-case-conflict
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2
build:
os: ubuntu-20.04
tools:
python: "3.9"
python: "3.12"
apt_packages:
- graphviz

Expand Down
1 change: 1 addition & 0 deletions changelog/257.breaking.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Increased the minimum version of Python to 3.10.0
92 changes: 0 additions & 92 deletions joss_paper/paper.bib

This file was deleted.

134 changes: 0 additions & 134 deletions joss_paper/paper.md

This file was deleted.

8 changes: 5 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ classifiers =
Operating System :: OS Independent
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Programming Language :: Python :: 3.12
Topic :: Scientific/Engineering :: Physics

[options]
zip_safe = False
python_requires = >=3.9
python_requires = >=3.10
packages = find:
include_package_data = True
setup_requires =
Expand All @@ -40,7 +40,7 @@ install_requires =

[options.extras_require]
instr =
sunpy>=5.0.0rc1
sunpy>=5.0.0
tests =
pytest-astropy
docs =
Expand Down Expand Up @@ -88,6 +88,8 @@ filterwarnings =
ignore: invalid value encountered in true_divide
# https://github.com/pytest-dev/pytest-cov/issues/557
ignore:The --rsyncdir command line argument and rsyncdirs config variable are deprecated.:DeprecationWarning
doctest_subpackage_requires =
docs/* = ndcube<2.3.0

[pycodestyle]
max_line_length = 120
Expand Down
4 changes: 3 additions & 1 deletion sunraster/instr/spice.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,9 @@ def read_spice_l2_fits(filenames, windows=None, memmap=True, read_dumbbells=Fals
first_sequence = window_sequences[0][1]
first_spectral_window = first_sequence[0].meta.spectral_window
if all(window[1][0].meta.spectral_window == first_spectral_window for window in window_sequences):
aligned_axes = tuple(range(len(first_sequence.dimensions)))
aligned_axes = tuple(
range(len(first_sequence.shape if hasattr(first_sequence, "shape") else first_sequence.dimensions))
)
else:
aligned_axes = tuple(
i for i, phys_type in enumerate(first_sequence.array_axis_physical_types) if "em.wl" not in phys_type
Expand Down
Loading
Loading