Skip to content

Commit

Permalink
Merge pull request #759 from Cadair/cruft-manual-update
Browse files Browse the repository at this point in the history
Updates from package template
  • Loading branch information
nabobalis authored Sep 10, 2024
2 parents 8a4c09a + 06a01b6 commit 00e4a6b
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 28 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
45 changes: 23 additions & 22 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,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 @@ -62,7 +62,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 @@ -86,7 +86,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 @@ -95,27 +95,28 @@ jobs:
secrets:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

publish_pure:
if: |
github.event_name != 'pull_request' && (
github.ref_name != 'main' ||
github.event_name == 'workflow_dispatch'
) || (
github.event_name == 'pull_request' &&
contains(github.event.pull_request.labels.*.name, 'Run publish')
)
needs: [test, docs]
uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@v1
with:
python-version: '3.10'
test_extras: 'dev'
test_command: 'pytest -p no:warnings --doctest-rst --pyargs ndcube'
submodules: false
secrets:
pypi_token: ${{ secrets.pypi_token }}
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.12'
test_extras: 'tests'
test_command: 'pytest -p no:warnings --doctest-rst --pyargs ndcube'
submodules: false
secrets:
pypi_token: ${{ secrets.pypi_token }}

notify:
if: always() && github.event_name == 'workflow_dispatch'
needs: [publish_pure, cron]
needs: [publish, cron]
runs-on: ubuntu-latest
steps:
- uses: Cadair/matrix-notify-action@main
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: ndcube
channels:
- conda-forge
dependencies:
- python=3.11
- python=3.12
- pip
- graphviz!=2.42.*,!=2.43.*
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
requires = [
"setuptools>=62.1",
"setuptools_scm[toml]>=6.2",
"wheel"
"wheel",
]
build-backend = "setuptools.build_meta"

Expand Down Expand Up @@ -67,6 +67,7 @@ zip-safe = false
include-package-data = true

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

[tool.setuptools_scm]
Expand Down

0 comments on commit 00e4a6b

Please sign in to comment.