diff --git a/.cruft.json b/.cruft.json index 71689dc..c2ffd5c 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/sunpy/package-template", - "commit": "2fbaccff08fdfbb1bc1eec2bc7b980fe44a718e6", + "commit": "67ea3b3815de57668e92dbe1fa2c3d033758d8f0", "checkout": null, "context": { "cookiecutter": { diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f829a73..334e2d9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index badc468..fe741fd 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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"] diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 790abab..3d9312d 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -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 diff --git a/.rtd-environment.yml b/.rtd-environment.yml index 3e8b395..7c73958 100644 --- a/.rtd-environment.yml +++ b/.rtd-environment.yml @@ -2,6 +2,6 @@ name: sunkit-magex channels: - conda-forge dependencies: - - python=3.10 + - python=3.12 - pip - graphviz!=2.42.*,!=2.43.* diff --git a/pyproject.toml b/pyproject.toml index 8698a99..8abaf93 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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]