Skip to content

Commit 6df5ff7

Browse files
committed
Update cruft with batchpr
1 parent 8a4c09a commit 6df5ff7

File tree

6 files changed

+40
-7
lines changed

6 files changed

+40
-7
lines changed

.cruft.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"template": "https://github.com/sunpy/package-template",
3-
"commit": "2fbaccff08fdfbb1bc1eec2bc7b980fe44a718e6",
3+
"commit": "67ea3b3815de57668e92dbe1fa2c3d033758d8f0",
44
"checkout": null,
55
"context": {
66
"cookiecutter": {

.github/workflows/ci.yml

+27-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- uses: actions/checkout@v4
3838
- uses: actions/setup-python@v5
3939
with:
40-
python-version: '3.10'
40+
python-version: '3.12'
4141
- run: python -m pip install -U --user build
4242
- run: python -m build . --sdist
4343
- run: python -m pip install -U --user twine
@@ -62,7 +62,7 @@ jobs:
6262
needs: [core]
6363
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@main
6464
with:
65-
default_python: '3.10'
65+
default_python: '3.12'
6666
submodules: false
6767
pytest: false
6868
toxdeps: tox-pypi-filter
@@ -86,12 +86,36 @@ jobs:
8686
)
8787
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@main
8888
with:
89-
default_python: '3.10'
89+
default_python: '3.12'
9090
submodules: false
9191
coverage: codecov
9292
toxdeps: tox-pypi-filter
9393
envs: |
9494
- linux: py311-devdeps
95+
<<<<<<<
96+
=======
97+
secrets:
98+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
99+
100+
publish:
101+
needs: [test, docs]
102+
# Build wheels on PRs only when labelled. Releases will only be published if tagged ^v.*
103+
# see https://github-actions-workflows.openastronomy.org/en/latest/publish.html#upload-to-pypi
104+
if: |
105+
github.event_name != 'pull_request' ||
106+
(
107+
github.event_name == 'pull_request' &&
108+
contains(github.event.pull_request.labels.*.name, 'Run publish')
109+
)
110+
uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@main
111+
with:
112+
python-version: '3.12'
113+
test_extras: 'tests'
114+
test_command: 'pytest -p no:warnings --doctest-rst --pyargs ndcube'
115+
submodules: false
116+
secrets:
117+
pypi_token: ${{ secrets.pypi_token }}
118+
>>>>>>>
95119
secrets:
96120
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
97121

.pre-commit-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
repos:
22
# This should be before any formatting hooks like isort
33
- repo: https://github.com/astral-sh/ruff-pre-commit
4-
rev: "v0.5.4"
4+
rev: "v0.6.3"
55
hooks:
66
- id: ruff
77
args: ["--fix"]

.readthedocs.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
version: 2
22

33
build:
4-
os: ubuntu-22.04
4+
os: ubuntu-lts-latest
55
tools:
6-
python: "mambaforge-4.10"
6+
python: "mambaforge-latest"
77
jobs:
88
post_checkout:
99
- git fetch --unshallow || true

.rtd-environment.yml

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ name: ndcube
22
channels:
33
- conda-forge
44
dependencies:
5+
<<<<<<<
56
- python=3.11
7+
=======
8+
- python=3.12
9+
>>>>>>>
610
- pip
711
- graphviz!=2.42.*,!=2.43.*

pyproject.toml

+5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
requires = [
33
"setuptools>=62.1",
44
"setuptools_scm[toml]>=6.2",
5+
<<<<<<<
56
"wheel"
7+
=======
8+
"wheel",
9+
>>>>>>>
610
]
711
build-backend = "setuptools.build_meta"
812

@@ -67,6 +71,7 @@ zip-safe = false
6771
include-package-data = true
6872

6973
[tool.setuptools.packages.find]
74+
include = ["ndcube*"]
7075
exclude = ["ndcube._dev*"]
7176

7277
[tool.setuptools_scm]

0 commit comments

Comments
 (0)