Skip to content

Commit

Permalink
Merge branch 'main' into sunpy_version
Browse files Browse the repository at this point in the history
  • Loading branch information
nabobalis authored Sep 10, 2024
2 parents 0c2ba7f + a561de9 commit 4f9bd41
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .cruft.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"template": "https://github.com/sunpy/package-template",
"commit": "2fbaccff08fdfbb1bc1eec2bc7b980fe44a718e6",
"commit": "67ea3b3815de57668e92dbe1fa2c3d033758d8f0",
"checkout": null,
"context": {
"cookiecutter": {
Expand Down
18 changes: 13 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: '3.12'
- run: python -m pip install -U --user build
- run: python -m build . --sdist
- run: python -m pip install -U --user twine
Expand All @@ -64,7 +64,7 @@ jobs:
needs: [core]
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@main
with:
default_python: '3.10'
default_python: '3.12'
submodules: false
pytest: false
toxdeps: tox-pypi-filter
Expand All @@ -82,7 +82,7 @@ jobs:
)
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@main
with:
default_python: '3.10'
default_python: '3.12'
submodules: false
coverage: codecov
toxdeps: tox-pypi-filter
Expand All @@ -91,11 +91,19 @@ jobs:
secrets:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

publish_pure:
publish:
needs: [test, docs]
# Build wheels on PRs only when labelled. Releases will only be published if tagged ^v.*
# see https://github-actions-workflows.openastronomy.org/en/latest/publish.html#upload-to-pypi
if: |
github.event_name != 'pull_request' ||
(
github.event_name == 'pull_request' &&
contains(github.event.pull_request.labels.*.name, 'Run publish')
)
uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@main
with:
python-version: '3.10'
python-version: '3.12'
test_extras: 'tests'
test_command: 'pytest -p no:warnings --doctest-rst --pyargs sunkit_magex'
submodules: false
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
repos:
# This should be before any formatting hooks like isort
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: "v0.5.4"
rev: "v0.6.3"
hooks:
- id: ruff
args: ["--fix"]
Expand Down
4 changes: 2 additions & 2 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
version: 2

build:
os: ubuntu-22.04
os: ubuntu-lts-latest
tools:
python: "mambaforge-4.10"
python: "mambaforge-latest"
jobs:
post_checkout:
- git fetch --unshallow || true
Expand Down
2 changes: 1 addition & 1 deletion .rtd-environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ name: sunkit-magex
channels:
- conda-forge
dependencies:
- python=3.10
- python=3.12
- pip
- graphviz!=2.42.*,!=2.43.*
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ zip-safe = false
include-package-data = true

[tool.setuptools.packages.find]
include = ["sunkit_magex*"]
exclude = ["sunkit_magex._dev*"]

[tool.setuptools_scm]
Expand Down

0 comments on commit 4f9bd41

Please sign in to comment.