Skip to content

Commit

Permalink
Merge pull request #65 from sunpy/ci
Browse files Browse the repository at this point in the history
  • Loading branch information
nabobalis authored May 24, 2022
2 parents 32f0498 + bd7519b commit 809317a
Show file tree
Hide file tree
Showing 54 changed files with 2,655 additions and 1,976 deletions.
102 changes: 20 additions & 82 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,95 +1,33 @@
ci:
autofix_prs: false
repos:
# The warnings/errors we check for here are:
# E101 - mix of tabs and spaces
# E11 - Fix indentation.
# E111 - 4 spaces per indentation level
# E112 - 4 spaces per indentation level
# E113 - 4 spaces per indentation level
# E121 - Fix indentation to be a multiple of four.
# E122 - Add absent indentation for hanging indentation.
# E123 - Align closing bracket to match opening bracket.
# E124 - Align closing bracket to match visual indentation.
# E125 - Indent to distinguish line from next logical line.
# E126 - Fix over-indented hanging indentation.
# E127 - Fix visual indentation.
# E128 - Fix visual indentation.
# E129 - Fix visual indentation.
# E131 - Fix hanging indent for unaligned continuation line.
# E133 - Fix missing indentation for closing bracket.
# E20 - Remove extraneous whitespace.
# E211 - Remove extraneous whitespace.
# E231 - Add missing whitespace.
# E241 - Fix extraneous whitespace around keywords.
# E242 - Remove extraneous whitespace around operator.
# E251 - Remove whitespace around parameter '=' sign.
# E252 - Missing whitespace around parameter equals.
# E26 - Fix spacing after comment hash for inline comments.
# E265 - Fix spacing after comment hash for block comments.
# E266 - Fix too many leading '#' for block comments.
# E27 - Fix extraneous whitespace around keywords.
# E301 - Add missing blank line.
# E302 - Add missing 2 blank lines.
# E303 - Remove extra blank lines.
# E304 - Remove blank line following function decorator.
# E305 - expected 2 blank lines after class or function definition
# E305 - Expected 2 blank lines after end of function or class.
# E306 - expected 1 blank line before a nested definition
# E306 - Expected 1 blank line before a nested definition.
# E401 - Put imports on separate lines.
# E402 - Fix module level import not at top of file
# E502 - Remove extraneous escape of newline.
# E701 - Put colon-separated compound statement on separate lines.
# E711 - Fix comparison with None.
# E712 - Fix comparison with boolean.
# E713 - Use 'not in' for test for membership.
# E714 - Use 'is not' test for object identity.
# E722 - Fix bare except.
# E731 - Use a def when use do not assign a lambda expression.
# E901 - SyntaxError or IndentationError
# E902 - IOError
# F822 - undefined name in __all__
# F823 - local variable name referenced before assignment
# W291 - Remove trailing whitespace.
# W292 - Add a single newline at the end of the file.
# W293 - Remove trailing whitespace on blank line.
# W391 - Remove trailing blank lines.
# W601 - Use "in" rather than "has_key()".
# W602 - Fix deprecated form of raising exception.
# W603 - Use "!=" instead of "<>"
# W604 - Use "repr()" instead of backticks.
# W605 - Fix invalid escape sequence 'x'.
# W690 - Fix various deprecated code (via lib2to3).
- repo: https://github.com/PyCQA/flake8
rev: 4.0.1
hooks:
- id: flake8
args: ['--count', '--select', 'E101,E11,E111,E112,E113,E121,E122,E123,E124,E125,E126,E127,E128,E129,E131,E133,E20,E211,E231,E241,E242,E251,E252,E26,E265,E266,E27,E301,E302,E303,E304,E305,E306,E401,E402,E502,E701,E711,E712,E713,E714,E722,E731,E901,E902,F822,F823,W191,W291,W292,W293,W391,W601,W602,W603,W604,W605,W690']
exclude: ".*(.fits|.fts|.fit|.txt|tca.*|extern.*|.rst|.md)$"
- repo: https://github.com/myint/autoflake
rev: v1.4
hooks:
- id: autoflake
args: ['--in-place', '--remove-all-unused-imports', '--remove-unused-variable']
exclude: ".*(.fits|.fts|.fit|.txt|tca.*|extern.*|.rst|.md|__init__.py|docs/conf.py)$"
- repo: https://github.com/PyCQA/isort
rev: 5.10.1
hooks:
- repo: https://github.com/psf/black
rev: 22.3.0
hooks:
- id: black
exclude: ".*(.fits|.fts|.fit|.txt|.csv)$"
- repo: https://github.com/PyCQA/isort
rev: 5.10.1
hooks:
- id: isort
args: ['--sp','setup.cfg']
exclude: ".*(.fits|.fts|.fit|.txt|tca.*|extern.*|.rst|.md|docs/conf.py)$"
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.2.0
hooks:
exclude: ".*(.fits|.fts|.fit|.txt|.csv)$"
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.2.0
hooks:
- id: check-ast
- id: check-case-conflict
- id: trailing-whitespace
exclude: ".*(.fits|.fts|.fit|.txt)$"
exclude: ".*(.fits|.fts|.fit|.txt|.csv)$"
- id: mixed-line-ending
exclude: ".*(.fits|.fts|.fit|.txt|.csv)$"
- id: end-of-file-fixer
exclude: ".*(.fits|.fts|.fit|.txt|.csv)$"
- id: check-yaml
- id: debug-statements
- id: check-added-large-files
- id: end-of-file-fixer
exclude: ".*(.fits|.fts|.fit|.txt|tca.*)$"
- id: mixed-line-ending
exclude: ".*(.fits|.fts|.fit|.txt|tca.*)$"

ci:
autofix_prs: false
22 changes: 20 additions & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
Radiospectra v0.3.0 (2021-04-01)
================================
0.4.0 (2022-05-24)
==================

Breaking Changes
----------------

- Minimum supported version of Python is now 3.8
- Minimum supported version of ``sunpy`` is now 4.0.0 (LTS)

Features
--------

- Add a new spectrogram class `radiospectra.spectrogram2.spectrogram.BaseSpectrogram` and factory `radiospectra.spectrogram2.spectrogram.SpectrogramFactory` with sources for `~radiospectra.spectrogram2.sources.SWAVESSpectrogram`, `~radiospectra.spectrogram2.sources.RFSSpectrogram`, `~radiospectra.spectrogram2.sources.CALISTOSpectrogram`, `~radiospectra.spectrogram2.sources.EOVSASpectrogram` and `~radiospectra.spectrogram2.sources.RSTNSpectrogram`. (`#44 <https://github.com/sunpy/radiospectra/pull/44>`__)
- Add `sunpy.net.Fido` clients for `~radiospectra.net.sources.callisto.CALLISTOClient`, `~radiospectra.net.sources.eovsa.EOVSAClient` and `~radiospectra.net.sources.rstn.RSTNClient`. (`#44 <https://github.com/sunpy/radiospectra/pull/44>`__)
- Improve `~radiospectra.spectrogram2.spectrogram.SpectrogramFactory` input handling more inputs formats data header pairs, files, urls. (`#54 <https://github.com/sunpy/radiospectra/pull/54>`__)
- Add `sunpy.net.Fido` client `~radiospectra.net.sources.wind.Waves` and spectrogram class `~radiospectra.spectrogram2.sources.WAVESSpectrogram` for WIND/WAVES. (`#54 <https://github.com/sunpy/radiospectra/pull/54>`__)


0.3.0 (2021-04-01)
==================

Features
--------
Expand Down
27 changes: 0 additions & 27 deletions LICENSE

This file was deleted.

2 changes: 1 addition & 1 deletion LICENSE.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2018-2021, The SunPy Developers
Copyright (c) 2018-2022, The SunPy Developers

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
Expand Down
27 changes: 7 additions & 20 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,15 @@ stages:
coverage: codecov
toxdeps: tox-pypi-filter
posargs: -n=4

libraries:
apt:
- libopenjp2-7

envs:
- linux: codestyle
name: style_check
pytest: false
libraries: {}

- linux: py38
- linux: py310

- stage: SecondPhaseTests
displayName: Stage 2 Tests
Expand All @@ -68,30 +65,20 @@ stages:
coverage: codecov
toxdeps: tox-pypi-filter
posargs: -n=4

libraries:
apt:
- libopenjp2-7
- graphviz
brew:
- openjpeg

envs:
- macos: py37

- macos: py38
- windows: py39

- linux: build_docs
posargs: " "
pytest: false

- linux: py38-online

- linux: py37-oldestdeps

- linux: py38-conda
libraries: {}

- linux: py39-online
- linux: py38-oldestdeps

- ${{ if or(eq(variables['Build.Reason'], 'Schedule'), eq(variables['Build.Reason'], 'Manual')) }}:
- stage: CronTests
Expand All @@ -105,13 +92,13 @@ stages:
coverage: codecov
toxdeps: tox-pypi-filter
posargs: -n=4

libraries:
apt:
- libopenjp2-7

envs:
- linux: py38-devdeps
- linux: py310-devdeps
- linux: py39-conda
libraries: {}

# On branches which aren't main, and not Pull Requests, build the wheels but only upload them on tags
- ${{ if and(ne(variables['Build.Reason'], 'PullRequest'), or(ne(variables['Build.SourceBranchName'], 'main'), eq(variables['Build.Reason'], 'Schedule'), eq(variables['Build.Reason'], 'Manual'))) }}:
Expand Down
1 change: 0 additions & 1 deletion changelog/44.feature.1.rst

This file was deleted.

1 change: 0 additions & 1 deletion changelog/44.feature.2.rst

This file was deleted.

1 change: 0 additions & 1 deletion changelog/54.feature.1.rst

This file was deleted.

1 change: 0 additions & 1 deletion changelog/54.feature.2.rst

This file was deleted.

6 changes: 3 additions & 3 deletions docs/code_ref/index.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.. _reference:

==============
Code Reference
==============
===
API
===

.. toctree::
:maxdepth: 2
Expand Down
Loading

0 comments on commit 809317a

Please sign in to comment.