Skip to content

Commit 982d9e4

Browse files
CadairCadair
committed
Resolve conflicts
1 parent 6bfebf2 commit 982d9e4

2 files changed

Lines changed: 29 additions & 115 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 29 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,9 @@ concurrency:
2222

2323
permissions: {}
2424

25-
jobs:
26-
core:
27-
<<<<<<<
28-
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v3.0.1 # zizmor: ignore[unpinned-uses]
29-
=======
30-
<<<<<<<
31-
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v3 # zizmor: ignore[unpinned-uses]
32-
>>>>>>>
33-
=======
34-
3525
jobs:
3626
core:
3727
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@8c8bb6c6c962542921f993d47d26df38dccd50b1 # v3.0.2
38-
>>>>>>>
3928
with:
4029
submodules: false
4130
coverage: codecov
@@ -52,15 +41,7 @@ jobs:
5241
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
5342
with:
5443
persist-credentials: false
55-
<<<<<<<
56-
<<<<<<<
57-
- uses: actions/setup-python@v7 # zizmor: ignore[unpinned-uses]
58-
=======
59-
- uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
60-
>>>>>>>
61-
=======
6244
- uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
63-
>>>>>>>
6445
with:
6546
python-version: '3.13'
6647
- run: python -m pip install -U --user build
@@ -70,15 +51,7 @@ jobs:
7051

7152
test:
7253
needs: [core, sdist_verify]
73-
<<<<<<<
74-
<<<<<<<
75-
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v3.0.1 # zizmor: ignore[unpinned-uses]
76-
=======
77-
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v3 # zizmor: ignore[unpinned-uses]
78-
>>>>>>>
79-
=======
8054
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@8c8bb6c6c962542921f993d47d26df38dccd50b1 # v3.0.2
81-
>>>>>>>
8255
with:
8356
submodules: false
8457
coverage: codecov
@@ -97,44 +70,9 @@ jobs:
9770
secrets:
9871
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
9972

100-
threading:
101-
needs: [core, sdist_verify]
102-
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v3.0.1 # zizmor: ignore[unpinned-uses]
103-
with:
104-
submodules: false
105-
coverage: codecov
106-
toxdeps: tox-pypi-filter
107-
posargs: -n auto --color=yes
108-
libraries: |
109-
brew:
110-
- openjpeg
111-
apt:
112-
- libopenjp2-7
113-
setenv: |
114-
RUSTUP_TOOLCHAIN: stable # needed for building mocpy (a dependency of reproject)
115-
envs: |
116-
- linux: py314
117-
name: py314 (parallel threads)
118-
posargs: --parallel-threads=auto --color=yes
119-
- linux: py314t-devdeps-minimal
120-
name: py314t-devdeps
121-
- linux: py314t-devdeps-minimal
122-
name: py314t-devdeps (parallel threads)
123-
posargs: --parallel-threads=auto --color=yes
124-
secrets:
125-
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
126-
12773
docs:
12874
needs: [core]
129-
<<<<<<<
130-
<<<<<<<
131-
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v3.0.1 # zizmor: ignore[unpinned-uses]
132-
=======
133-
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v3 # zizmor: ignore[unpinned-uses]
134-
>>>>>>>
135-
=======
13675
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@8c8bb6c6c962542921f993d47d26df38dccd50b1 # v3.0.2
137-
>>>>>>>
13876
with:
13977
default_python: '3.13'
14078
submodules: false
@@ -151,36 +89,14 @@ jobs:
15189
- graphviz
15290
envs: |
15391
- linux: build_docs
154-
<<<<<<<
155-
=======
156-
online:
157-
needs: [core]
158-
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@8c8bb6c6c962542921f993d47d26df38dccd50b1 # v3.0.2
159-
with:
160-
submodules: false
161-
toxdeps: tox-pypi-filter
162-
envs: |
163-
164-
threading:
165-
needs: [core]
166-
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@8c8bb6c6c962542921f993d47d26df38dccd50b1 # v3.0.2
167-
with:
168-
submodules: false
169-
toxdeps: tox-pypi-filter
170-
envs: |
171-
172-
173-
build_dists:
174-
# Build wheels on PRs only when labelled. Releases will only be published if tagged ^v.*
175-
>>>>>>>
17692
pytest: false
17793
# Speed up CI builds by not building full nav tree
17894
posargs: -D html_theme_options.collapse_navigation=True
17995
18096
online:
18197
if: "!startsWith(github.event.ref, 'refs/tags/v')"
18298
needs: [docs]
183-
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v3.0.1 # zizmor: ignore[unpinned-uses]
99+
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@8c8bb6c6c962542921f993d47d26df38dccd50b1 # v3.0.2
184100
with:
185101
default_python: '3.13'
186102
submodules: false
@@ -205,6 +121,33 @@ jobs:
205121
secrets:
206122
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
207123

124+
threading:
125+
needs: [core]
126+
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@8c8bb6c6c962542921f993d47d26df38dccd50b1 # v3.0.2
127+
with:
128+
submodules: false
129+
coverage: codecov
130+
toxdeps: tox-pypi-filter
131+
posargs: -n auto --color=yes
132+
libraries: |
133+
brew:
134+
- openjpeg
135+
apt:
136+
- libopenjp2-7
137+
setenv: |
138+
RUSTUP_TOOLCHAIN: stable # needed for building mocpy (a dependency of reproject)
139+
envs: |
140+
- linux: py314
141+
name: py314 (parallel threads)
142+
posargs: --parallel-threads=auto --color=yes
143+
- linux: py314t-devdeps-minimal
144+
name: py314t-devdeps
145+
- linux: py314t-devdeps-minimal
146+
name: py314t-devdeps (parallel threads)
147+
posargs: --parallel-threads=auto --color=yes
148+
secrets:
149+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
150+
208151
build_dists:
209152
# Build wheels on PRs only when labelled. Releases will only be published if tagged ^v.*
210153
# see https://github-actions-workflows.openastronomy.org/en/latest/publish.html#upload-to-pypi
@@ -215,11 +158,7 @@ jobs:
215158
contains(github.event.pull_request.labels.*.name, 'Run publish')
216159
)
217160
needs: [test, docs]
218-
<<<<<<<
219-
uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish.yml@v3.0.1 # zizmor: ignore[unpinned-uses]
220-
=======
221-
uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish.yml@v3 # zizmor: ignore[unpinned-uses]
222-
>>>>>>>
161+
uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish.yml@8c8bb6c6c962542921f993d47d26df38dccd50b1 # v3.0.2
223162
with:
224163
sdist: false # Built with a universal wheel below
225164
targets: |
@@ -251,11 +190,7 @@ jobs:
251190
contains(github.event.pull_request.labels.*.name, 'Run publish')
252191
)
253192
needs: [test, docs]
254-
<<<<<<<
255-
uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@v3.0.1 # zizmor: ignore[unpinned-uses]
256-
=======
257193
uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish.yml@8c8bb6c6c962542921f993d47d26df38dccd50b1 # v3.0.2
258-
>>>>>>>
259194
with:
260195
python-version: "3.13"
261196
test_extras: 'tests'
@@ -286,11 +221,7 @@ jobs:
286221
- run: ls -lha dist/
287222

288223
- name: Run upload
289-
<<<<<<<
290-
uses: pypa/gh-action-pypi-publish@ba38be9e461d3875417946c167d0b5f3d385a247 # v1.14.1
291-
=======
292224
uses: pypa/gh-action-pypi-publish@dc37677b2e1c63e2034f94d8a5b11f265b73ba33 # v1.14.2
293-
>>>>>>>
294225

295226
notify:
296227
if: ${{ !cancelled() && (github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') }}

‎.pre-commit-config.yaml‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
11
repos:
22
- repo: https://github.com/zizmorcore/zizmor-pre-commit
3-
<<<<<<<
4-
rev: v1.26.1
5-
=======
63
rev: v1.28.0
7-
>>>>>>>
84
hooks:
95
- id: zizmor
106
# This should be before any formatting hooks like isort
117
- repo: https://github.com/astral-sh/ruff-pre-commit
12-
<<<<<<<
13-
rev: "v0.15.20"
14-
=======
158
rev: "v0.16.1"
16-
>>>>>>>
179
hooks:
1810
- id: ruff
1911
args: ["--fix"]
@@ -52,20 +44,11 @@ repos:
5244
types_or: [python, rst]
5345
- id: mixed-line-ending
5446
types_or: [python, rst]
55-
<<<<<<<
56-
=======
5747
- repo: https://github.com/codespell-project/codespell
5848
rev: v2.4.3
5949
hooks:
6050
- id: codespell
6151
args: [ "--write-changes" ]
62-
>>>>>>>
63-
- repo: https://github.com/adhtruong/mirrors-typos
64-
rev: v1.48.0
65-
hooks:
66-
- id: typos
67-
types_or: [python, rst]
68-
exclude: *exclude_dirs
6952
- repo: local
7053
hooks:
7154
- id: generate-sunpy-net-hek-attrs

0 commit comments

Comments
 (0)