Skip to content

Commit 024c20a

Browse files
authored
CI Fix (#70)
1 parent 202b70d commit 024c20a

File tree

9 files changed

+44
-23
lines changed

9 files changed

+44
-23
lines changed

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/ambv/black
3-
rev: 21.5b1
3+
rev: 21.11b0
44
hooks:
55
- id: black
66
- repo: https://github.com/myint/autoflake
@@ -10,13 +10,13 @@ repos:
1010
args: ['--in-place', '--remove-all-unused-imports', '--remove-unused-variable']
1111
exclude: ".*(.fits|.fts|.fit|.txt|tca.*|extern.*|.rst|.md|__init__.py|docs/conf.py)$"
1212
- repo: https://github.com/timothycrosley/isort
13-
rev: 5.8.0
13+
rev: 5.10.1
1414
hooks:
1515
- id: isort
1616
args: ['--sp','setup.cfg']
1717
exclude: ".*(.fits|.fts|.fit|.txt|tca.*|extern.*|.rst|.md|docs/conf.py)$"
1818
- repo: https://github.com/pre-commit/pre-commit-hooks
19-
rev: v4.0.0
19+
rev: v4.0.1
2020
hooks:
2121
- id: check-ast
2222
- id: check-case-conflict

CHANGELOG.rst

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
0.3.1 (2021-11-19)
2+
==================
3+
4+
- Fixed a bug where a `~astropy.units.UnitConversionError` was thrown if a non-dimensionless
5+
`~astropy.units.Quantity` object was input for the signal in `~sunkit_image.time_lag.cross_correlation`. (`#72 <https://github.com/sunpy/sunkit-image/pull/72>`__)
6+
- Fixed a bug where the way we dealt with `~astropy.unit.Quantity` objects was inconsistent with
7+
`~dask.array.Array` objects in newer versions of `~numpy`. The `pre_check_hook` option keyword
8+
argument has also been removed from `~sunkit_image.time_lag.time_lag` and `post_check_hook`
9+
has been renamed to `array_check` and now accepts two arguments. (`#72 <https://github.com/sunpy/sunkit-image/pull/72>`__)
10+
11+
12+
Trivial/Internal Changes
13+
------------------------
14+
15+
- A warning is now raised if the input data to `~sunkit_image.enhance.mgn` contain any NaNs. (`#73 <https://github.com/sunpy/sunkit-image/pull/73>`__)
16+
117
0.3.0 (2021-06-02)
218
==================
319

azure-pipelines.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ stages:
4646
name: style_check
4747
pytest: false
4848
libraries: {}
49-
- linux: py38
49+
- linux: py310
5050

5151
- stage: SecondPhaseTests
5252
displayName: Stage 2 Tests
@@ -67,7 +67,7 @@ stages:
6767
- linux: build_docs
6868
posargs: " "
6969
pytest: false
70-
- linux: py38-online
70+
- linux: py39-online
7171
- linux: py37-oldestdeps
7272

7373
- ${{ if or(eq(variables['Build.Reason'], 'Schedule'), eq(variables['Build.Reason'], 'Manual')) }}:
@@ -82,7 +82,7 @@ stages:
8282
coverage: codecov
8383
toxdeps: tox-pypi-filter
8484
envs:
85-
- linux: py38-devdeps
85+
- linux: py310-devdeps
8686

8787
# On branches which aren't main, and not Pull Requests, build the wheels but only upload them on tags
8888
- ${{ if and(ne(variables['Build.Reason'], 'PullRequest'), or(ne(variables['Build.SourceBranchName'], 'main'), eq(variables['Build.Reason'], 'Schedule'), eq(variables['Build.Reason'], 'Manual'))) }}:

changelog/72.bugfix.1.rst

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

changelog/72.bugfix.2.rst

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

changelog/73.trivial.rst

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

docs/conf.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
# flake8: NOQA: E402
66

77
# -- stdlib imports ------------------------------------------------------------
8+
import pathlib
89
import os
910
import sys
1011
import datetime
@@ -187,7 +188,6 @@
187188
]
188189

189190
# -- Options for the Sphinx gallery -------------------------------------------
190-
import pathlib
191191

192192
path = pathlib.Path.cwd()
193193
example_dir = path.parent.joinpath("examples")
@@ -198,5 +198,7 @@
198198
"gallery_dirs": path.joinpath("generated", "gallery"),
199199
"default_thumb_file": path.joinpath("logo", "sunpy_icon_128x128.png"),
200200
"abort_on_example_error": False,
201-
"plot_gallery": True,
201+
"plot_gallery": "True",
202+
"remove_config_comments": True,
203+
"only_warn_on_example_error": True,
202204
}

readthedocs.yml

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
1+
# readthedocs.yml
2+
# Read the Docs configuration file
3+
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
4+
15
version: 2
26

7+
build:
8+
image: latest
9+
10+
sphinx:
11+
builder: html
12+
configuration: docs/conf.py
13+
fail_on_warning: false
14+
315
python:
4-
version: 3.7
516
install:
6-
# Use this to override dep versions.
7-
- requirements: docs/rtd_requirements.txt
8-
- method: pip
9-
path: .
10-
extra_requirements:
11-
- docs
17+
- requirements: docs/rtd_requirements.txt
18+
- method: pip
19+
extra_requirements:
20+
- dev
21+
path: .

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
22
envlist =
3-
py{37,38,39}{,-oldestdeps,-devdeps,-online,-figure}
3+
py{37,38,39,310}{,-oldestdeps,-devdeps,-online,-figure}
44
build_docs
55
codestyle
66
requires =

0 commit comments

Comments
 (0)