Skip to content

Commit c8f753d

Browse files
committed
Changes
1 parent e79df4f commit c8f753d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+675
-904
lines changed

.codecov.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
codecov:
2+
token: a0dfd87f-8eb9-4a41-9e4e-a06919f216cd
3+
comment: off
4+
coverage:
5+
status:
6+
project:
7+
default:
8+
threshold: 0.2%

.github/workflows/ci.yml

Lines changed: 24 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@ name: CI
33
on:
44
push:
55
branches:
6-
- 'main'
7-
- '*.*'
8-
- '!*backport*'
6+
- "main"
7+
- "*.*"
8+
- "!*backport*"
99
tags:
10-
- 'v*'
11-
- '!*dev*'
12-
- '!*pre*'
13-
- '!*post*'
10+
- "v*"
11+
- "!*dev*"
12+
- "!*pre*"
13+
- "!*post*"
1414
pull_request:
1515
workflow_dispatch:
1616
schedule:
17-
# ┌───────── minute (0 - 59)
18-
# │ ┌───────── hour (0 - 23)
19-
# │ │ ┌───────── day of the month (1 - 31)
20-
# │ │ │ ┌───────── month (1 - 12 or JAN-DEC)
21-
# │ │ │ │ ┌───────── day of the week (0 - 6 or SUN-SAT)
22-
- cron: '0 7 * * *' # Every day at 07:00 UTC
17+
# ┌───────── minute (0 - 59)
18+
# │ ┌───────── hour (0 - 23)
19+
# │ │ ┌───────── day of the month (1 - 31)
20+
# │ │ │ ┌───────── month (1 - 12 or JAN-DEC)
21+
# │ │ │ │ ┌───────── day of the week (0 - 6 or SUN-SAT)
22+
- cron: "0 7 * * *" # Every day at 07:00 UTC
2323

2424
concurrency:
2525
group: ${{ github.workflow }}-${{ github.ref }}
@@ -36,7 +36,7 @@ jobs:
3636
- pandoc
3737
- graphviz
3838
envs: |
39-
- linux: py312-sphinx7
39+
- linux: py312-sphinx8
4040
secrets:
4141
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
4242

@@ -57,17 +57,18 @@ jobs:
5757
- pandoc
5858
- graphviz
5959
envs: |
60-
- linux: py311-sphinx6
61-
- macos: py310-sphinx5
62-
- windows: py39-sphinx5
60+
- macos: py311-sphinx7
61+
- windows: py310-sphinx7
62+
- linux: py310-sphinx6
63+
- linux: py312-pydata-sphinx-theme
64+
- linux: py312-devdeps
6365
secrets:
6466
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
6567

66-
docs:
67-
needs: [core]
68+
extras:
69+
needs: [tests]
6870
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@main
6971
with:
70-
default_python: '3.9'
7172
submodules: false
7273
pytest: false
7374
libraries: |
@@ -76,9 +77,11 @@ jobs:
7677
- graphviz
7778
envs: |
7879
- linux: py312-docs
80+
- linux: pydata-sphinx-theme-dev
81+
- linux: py312-linkcheck
7982
8083
conda:
81-
needs: [core]
84+
needs: [tests]
8285
runs-on: ubuntu-latest
8386
steps:
8487
- uses: actions/checkout@v4
@@ -100,19 +103,3 @@ jobs:
100103
conda list
101104
pytest -vvv -r a --pyargs ablog
102105
make tests
103-
104-
extras:
105-
needs: [tests]
106-
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@main
107-
with:
108-
default_python: '3.9'
109-
submodules: false
110-
coverage: codecov
111-
libraries: |
112-
apt:
113-
- pandoc
114-
- graphviz
115-
envs: |
116-
- linux: py312-sphinxdev
117-
secrets:
118-
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/pythonpublish.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ jobs:
88
deploy:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v3
12-
- name: Set up Python
13-
uses: actions/setup-python@v4
14-
with:
15-
python-version: '3.x'
16-
- name: Install dependencies
17-
run: |
18-
python -m pip install --upgrade pip
19-
python -m pip install -U --user --force-reinstall pep517 setuptools_scm twine
20-
- name: Build and publish
21-
env:
22-
TWINE_USERNAME: __token__
23-
TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
24-
run: |
25-
python -m pep517.build --binary --source --out-dir wheelhouse .
26-
python -m twine upload --skip-existing wheelhouse/*
11+
- uses: actions/checkout@v3
12+
- name: Set up Python
13+
uses: actions/setup-python@v4
14+
with:
15+
python-version: "3.x"
16+
- name: Install dependencies
17+
run: |
18+
python -m pip install --upgrade pip
19+
python -m pip install -U --user --force-reinstall pep517 setuptools_scm twine
20+
- name: Build and publish
21+
env:
22+
TWINE_USERNAME: __token__
23+
TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
24+
run: |
25+
python -m pep517.build --binary --source --out-dir wheelhouse .
26+
python -m twine upload --skip-existing wheelhouse/*

.gitignore

Lines changed: 3 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,6 @@ instance/
6363
# Scrapy stuff:
6464
.scrapy
6565

66-
# Sphinx documentation
67-
docs/_build/
68-
6966
# PyBuilder
7067
target/
7168

@@ -138,24 +135,10 @@ Icon
138135

139136
### MacOS: https://raw.githubusercontent.com/github/gitignore/master/Global/macOS.gitignore
140137

141-
# General
142-
.DS_Store
143-
.AppleDouble
144-
.LSOverride
145-
146-
# Icon must end with two \r
147-
Icon
148-
149-
150-
# Thumbnails
151-
._*
152-
153138
# Files that might appear in the root of a volume
154139
.DocumentRevisions-V100
155140
.fseventsd
156-
.Spotlight-V100
157141
.TemporaryItems
158-
.Trashes
159142
.VolumeIcon.icns
160143
.com.apple.timemachine.donotpresent
161144

@@ -195,29 +178,14 @@ $RECYCLE.BIN/
195178
### VScode: https://raw.githubusercontent.com/github/gitignore/master/Global/VisualStudioCode.gitignore
196179
.vscode/*
197180

198-
### Extra Python Items and SunPy Specific
199-
.hypothesis
200-
.pytest_cache
201-
sunpydata.sqlite
202-
sunpydata.sqlite-journal
203-
sunpy/_compiler.c
204-
sunpy/cython_version.py
205-
docs/_build
206-
docs/generated
207-
docs/api/
208-
docs/whatsnew/latest_changelog.txt
209-
examples/**/*.asdf
210-
# This is incase you run the figure tests
211-
figure_test_images*
212-
tags
213-
214181
### Pycharm(?)
215182
.idea
216183

217-
# Release script
184+
# Ablog
218185
.github_cache
219-
186+
src/ablog/version.py
220187
docs/_build/
188+
docs/api/
221189
docs/.doctrees/
222190
docs/_website/
223191
docs/_latex/
@@ -226,5 +194,4 @@ test/
226194
.history/
227195
pydata-sphinx-theme/
228196
_build
229-
_version.py
230197
demo/

.pre-commit-config.yaml

Lines changed: 44 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,54 @@
11
ci:
2-
autofix_prs: false
3-
autoupdate_schedule: "quarterly"
2+
autofix_prs: false
3+
autoupdate_schedule: "quarterly"
44
repos:
5-
- repo: https://github.com/PyCQA/autoflake
6-
rev: v2.3.1
5+
- repo: https://github.com/PyCQA/docformatter
6+
rev: v1.7.5
77
hooks:
8-
- id: autoflake
9-
args: ['--in-place', '--remove-all-unused-imports', '--remove-unused-variable']
10-
- repo: https://github.com/PyCQA/isort
11-
rev: 5.13.2
8+
- id: docformatter
9+
args: ["--in-place", "--pre-summary-newline", "--make-summary-multi"]
10+
- repo: https://github.com/PyCQA/autoflake
11+
rev: v2.3.1
1212
hooks:
13-
- id: isort
14-
- repo: https://github.com/psf/black
15-
rev: 24.8.0
13+
- id: autoflake
14+
args:
15+
[
16+
"--in-place",
17+
"--remove-all-unused-imports",
18+
"--remove-unused-variable",
19+
]
20+
exclude: ".*(.fits|.fts|.fit|.txt|tca.*|extern.*|.rst|.md|docs/conf.py)$"
21+
- repo: https://github.com/astral-sh/ruff-pre-commit
22+
rev: "v0.5.0"
1623
hooks:
17-
- id: black
18-
- repo: https://github.com/pre-commit/pre-commit-hooks
24+
- id: ruff
25+
args: ["--fix", "--unsafe-fixes"]
26+
- id: ruff-format
27+
- repo: https://github.com/pre-commit/pre-commit-hooks
1928
rev: v4.6.0
2029
hooks:
21-
- id: check-ast
22-
- id: check-case-conflict
23-
- id: trailing-whitespace
24-
- id: mixed-line-ending
25-
- id: end-of-file-fixer
26-
- id: check-yaml
27-
- id: debug-statements
28-
- repo: https://github.com/astral-sh/ruff-pre-commit
29-
rev: 'v0.5.7'
30+
- id: check-ast
31+
- id: check-case-conflict
32+
- id: trailing-whitespace
33+
exclude: ".*(.fits|.fts|.fit|.txt|.csv)$"
34+
- id: mixed-line-ending
35+
exclude: ".*(.fits|.fts|.fit|.txt|.csv)$"
36+
- id: end-of-file-fixer
37+
exclude: ".*(.fits|.fts|.fit|.txt|.csv)$"
38+
- id: check-yaml
39+
- id: debug-statements
40+
- repo: https://github.com/codespell-project/codespell
41+
rev: v2.3.0
3042
hooks:
31-
- id: ruff
32-
args: ['--fix']
33-
- repo: https://github.com/awebdeveloper/pre-commit-stylelint
34-
rev: '0.0.2'
43+
- id: codespell
44+
additional_dependencies:
45+
- tomli
46+
- repo: https://github.com/rbubley/mirrors-prettier
47+
rev: v3.3.3
3548
hooks:
36-
- id: stylelint
37-
additional_dependencies: ['[email protected]', '[email protected]']
38-
- repo: https://github.com/pre-commit/mirrors-prettier
39-
rev: v4.0.0-alpha.8
49+
- id: prettier
50+
- repo: https://github.com/Riverside-Healthcare/djLint
51+
rev: v1.34.1
4052
hooks:
41-
- id: prettier
42-
types_or: [css, scss, javascript]
43-
- repo: https://github.com/Riverside-Healthcare/djLint
44-
rev: v1.34.1
45-
hooks:
46-
- id: djlint-jinja
47-
types_or: ["html"]
53+
- id: djlint-jinja
54+
types_or: ["html"]

.readthedocs.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
version: 2
22
build:
3-
os: ubuntu-22.04
3+
os: ubuntu-lts-latest
44
tools:
5-
python: "mambaforge-4.10"
5+
python: "mambaforge-latest"
66
jobs:
77
pre_install:
88
- git update-index --assume-unchanged .rtd-environment.yml docs/conf.py
@@ -13,9 +13,9 @@ sphinx:
1313
configuration: docs/conf.py
1414
fail_on_warning: false
1515
python:
16-
install:
17-
- method: pip
18-
extra_requirements:
16+
install:
17+
- method: pip
18+
extra_requirements:
1919
- all
2020
- docs
21-
path: .
21+
path: .

.rtd-environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: rtd_ablog
22
channels:
33
- conda-forge
44
dependencies:
5-
- python=3.10
5+
- python=3.12
66
- pip
77
- graphviz
88
- make

.stylelintrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"extends": "stylelint-config-standard"
2+
"extends": "stylelint-config-standard"
33
}

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@ rebuild:
88
cd docs; watchmedo shell-command --patterns='*.rst' --command='ablog build' --recursive
99

1010
test:
11-
set -e; cd docs; ablog build -T -W; git clean -xfd; cd ..
11+
set -e; cd docs; git clean -xfd; ablog build -T -W; git clean -xfd; cd ..
1212

1313
test1:
14-
set -e; cd docs; ablog build -T -W -b json; git clean -xfd; cd ..
14+
set -e; cd docs; git clean -xfd; ablog build -T -W -b json; git clean -xfd; cd ..
1515

1616
test2:
17-
set -e; cd docs; ablog build -T -W -b pickle; git clean -xfd; cd ..
17+
set -e; cd docs; git clean -xfd; ablog build -T -W -b pickle; git clean -xfd; cd ..
1818

1919
test3:
20-
set -e; mkdir -p test; cd test; printf "\nABlog\nABlog Team\nhttps://ablog.readthedocs.io/" | ablog start; ablog build -W; cd ..; rm -rf test
20+
set -e; mkdir -p test; cd test; git clean -xfd; printf "\nABlog\nABlog Team\nhttps://ablog.readthedocs.io/" | ablog start; ablog build -W; cd ..; rm -rf test
2121

2222
test4:
23-
set -e; mkdir -p testablog; cd testablog; printf "\nABlog\nABlog Team\nhttps://ablog.readthedocs.io/" | ablog start; ablog build -W; cd ..; rm -rf testablog
23+
set -e; mkdir -p testablog; cd testablog; git clean -xfd; printf "\nABlog\nABlog Team\nhttps://ablog.readthedocs.io/" | ablog start; ablog build -W; cd ..; rm -rf testablog
2424

2525
test5:
26-
set -e; cd docs; ablog build -W -b latex -T -d .doctrees -w _latex; git clean -xfd; cd ..
26+
set -e; cd docs; git clean -xfd; ablog build -W -b latex -T -d .doctrees -w _latex; git clean -xfd; cd ..
2727

2828
tests: test test1 test2 test3 test4 test5

0 commit comments

Comments
 (0)