Skip to content

Commit ca4d29d

Browse files
nabobalisnabobalis
authored
CI devdeps + changelog (#176)
* CI devdeps * Changelog for 0.5.1 * Python versions + new bot * Conda * Fix doc warning
1 parent e527745 commit ca4d29d

File tree

9 files changed

+150
-86
lines changed

9 files changed

+150
-86
lines changed

‎.github/dependabot.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "monthly"

‎.github/workflows/ci.yml‎

Lines changed: 33 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ jobs:
4747
needs: [test]
4848
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@main
4949
with:
50+
default_python: '3.9'
5051
submodules: false
5152
pytest: false
5253
toxdeps: tox-pypi-filter
@@ -69,12 +70,8 @@ jobs:
6970
envs: |
7071
- linux: py311-online
7172
72-
cron:
73-
if: |
74-
github.event_name == 'workflow_dispatch' || (
75-
github.event_name == 'pull_request' &&
76-
contains(github.event.pull_request.labels.*.name, 'Run cron CI')
77-
)
73+
devdeps:
74+
needs: [online]
7875
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@main
7976
with:
8077
submodules: false
@@ -87,8 +84,35 @@ jobs:
8784
- libhdf5-dev
8885
envs: |
8986
- linux: py311-devdeps
90-
- linux: py39-conda
91-
libraries: ''
87+
88+
conda:
89+
needs: [online]
90+
runs-on: ubuntu-latest
91+
steps:
92+
- uses: actions/checkout@v4
93+
with:
94+
fetch-depth: 0
95+
lfs: true
96+
- uses: conda-incubator/setup-miniconda@v2
97+
with:
98+
installer-url: https://github.com/conda-forge/miniforge/releases/download/4.8.3-2/Miniforge-pypy3-4.8.3-2-Linux-x86_64.sh
99+
python-version: 3.11
100+
activate-environment: sunkit_image_test
101+
environment-file: sunkit-dev-env.yml
102+
- name: Install sunkit_image
103+
shell: bash -el {0}
104+
run: |
105+
pip install --no-deps --no-build-isolation .
106+
- name: Run tests
107+
shell: bash -el {0}
108+
run: |
109+
conda list
110+
cd /tmp
111+
pytest -vvv -r a --pyargs sunkit_image --cov-report=xml --cov=sunkit_image --cov-config=$GITHUB_WORKSPACE/setup.cfg $GITHUB_WORKSPACE/docs -n auto
112+
- uses: codecov/codecov-action@v3
113+
with:
114+
token: ${{ secrets.CODECOV_TOKEN }}
115+
files: ./coverage.xml
92116

93117
publish:
94118
# Build wheels when pushing to any branch except main
@@ -106,6 +130,7 @@ jobs:
106130
needs: [test]
107131
uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@main
108132
with:
133+
python-version: "3.11"
109134
test_extras: 'dev'
110135
test_command: 'pytest -p no:warnings --doctest-rst -m "not mpl_image_compare" --pyargs sunkit_image'
111136
submodules: false

‎.github/workflows/scheduled_builds.yml‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎.pre-commit-config.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ repos:
1111
args: ['--in-place', '--remove-all-unused-imports', '--remove-unused-variable']
1212
exclude: ".*(.fits|.fts|.fit|.txt|tca.*|extern.*|.rst|.md)$"
1313
- repo: https://github.com/astral-sh/ruff-pre-commit
14-
rev: 'v0.1.4'
14+
rev: 'v0.1.5'
1515
hooks:
1616
- id: ruff
1717
args: ['--fix']
1818
- repo: https://github.com/psf/black
19-
rev: 23.10.1
19+
rev: 23.11.0
2020
hooks:
2121
- id: black
2222
exclude: ".*(.fits|.fts|.fit|.txt|.csv)$"
@@ -45,7 +45,7 @@ repos:
4545
additional_dependencies:
4646
- tomli
4747
- repo: https://github.com/pre-commit/mirrors-mypy
48-
rev: 'v1.6.1'
48+
rev: 'v1.7.0'
4949
hooks:
5050
- id: mypy
5151
additional_dependencies: ['types-setuptools']

‎CHANGELOG.rst‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
0.5.1 (2023-11-17)
2+
==================
3+
4+
Trivial/Internal Changes
5+
------------------------
6+
7+
- Added the explicitly imported packages to the install requirements. (`#160 <https://github.com/sunpy/sunkit-image/pull/160>`__)
8+
19
0.5.0 (2023-08-10)
210
==================
311

‎changelog/160.trivial.rst‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎pyproject.toml‎

Lines changed: 53 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -23,70 +23,69 @@ dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
2323
target-version = "py39"
2424
line-length = 120
2525
exclude=[
26-
".git,",
27-
"__pycache__",
28-
"build",
29-
"tools/**",
26+
".git,",
27+
"__pycache__",
28+
"build",
29+
"tools/**",
3030
]
3131
select = [
32-
"E",
33-
"F",
34-
"W",
35-
"UP",
36-
"PT",
37-
"RET",
38-
"TID",
39-
"PLE",
40-
"NPY",
41-
"RUF",
42-
"PGH",
43-
"PTH",
44-
"BLE",
45-
"FBT",
46-
"B",
47-
"A",
48-
"COM",
49-
"C4",
50-
"T20",
51-
"RSE",
52-
"ERA",
32+
"E",
33+
"F",
34+
"W",
35+
"UP",
36+
"PT",
37+
"RET",
38+
"TID",
39+
"PLE",
40+
"NPY",
41+
"RUF",
42+
"PGH",
43+
"PTH",
44+
"BLE",
45+
"FBT",
46+
"B",
47+
"A",
48+
"COM",
49+
"C4",
50+
"T20",
51+
"RSE",
52+
"ERA",
5353
]
5454
fixable = [
55-
"E",
56-
"F",
57-
"W",
58-
"UP",
59-
"PT",
60-
"RET",
61-
"TID",
62-
"PLE",
63-
"NPY",
64-
"RUF",
65-
"PGH",
66-
"PTH",
67-
"BLE",
68-
"FBT",
69-
"B",
70-
"A",
71-
"COM",
72-
"C4",
73-
"T20",
74-
"RSE",
75-
"ERA",
55+
"E",
56+
"F",
57+
"W",
58+
"UP",
59+
"PT",
60+
"RET",
61+
"TID",
62+
"PLE",
63+
"NPY",
64+
"RUF",
65+
"PGH",
66+
"PTH",
67+
"BLE",
68+
"FBT",
69+
"B",
70+
"A",
71+
"COM",
72+
"C4",
73+
"T20",
74+
"RSE",
75+
"ERA",
7676
]
7777
extend-ignore = [
78-
"E501", # Line too long
79-
# TODO: Fix in future
80-
"E741", # Ambiguous variable name
81-
"B006", # Do not use mutable data structures for argument defaults
82-
"FBT002", # Boolean default value in function definition
83-
78+
"E501", # Line too long
79+
# TODO: Fix in future
80+
"E741", # Ambiguous variable name
81+
"B006", # Do not use mutable data structures for argument defaults
82+
"FBT002", # Boolean default value in function definition
8483
]
8584

8685
[tool.ruff.per-file-ignores]
8786
"examples/*.py" = [
88-
"T201", # We need print in our examples
89-
"PGH004", # Sometimes we need to use NOQA in examples
87+
"T201", # We need print in our examples
88+
"PGH004", # Sometimes we need to use NOQA in examples
9089
]
9190

9291
[tool.ruff.pydocstyle]

‎setup.cfg‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ docs =
5050
beautifulsoup4
5151
dask
5252
drms
53+
# Remove next line when fixed in towncrier; see https://github.com/twisted/towncrier/issues/528
54+
importlib-resources<6
5355
matplotlib
5456
sphinx
5557
sphinx_automodapi

‎sunkit-dev-env.yml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
channels:
2+
- conda-forge
3+
4+
dependencies:
5+
# Required
6+
- astropy
7+
- numpy
8+
- matplotlib
9+
- scipy
10+
- scikit-image
11+
- sunpy
12+
#- python # Commented out to avoid triggering an upgrade
13+
14+
# Optional
15+
- dask
16+
17+
# Testing
18+
- pytest-astropy
19+
- pytest-mpl
20+
- tox
21+
- tox-conda
22+
23+
# Documentation
24+
- graphviz
25+
- astroscrappy
26+
- beautifulsoup4
27+
- dask
28+
- drms
29+
- matplotlib
30+
- sphinx
31+
- sphinx-automodapi
32+
- sphinx-design
33+
- sphinx-gallery
34+
- zeep
35+
36+
# Installation
37+
- pip
38+
- setuptools-scm
39+
40+
# Development
41+
- pre-commit
42+
43+
- pip:
44+
- sphinx-changelog
45+
- sunpy-sphinx-theme

0 commit comments

Comments
 (0)