Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .cruft.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"template": "https://github.com/sunpy/package-template",
"commit": "2a6434a5c749ecde69d00b937a3fef27ecbad656",
"commit": "632ed04aee0058dd88dc6b7972ca8f8061fbd6da",
"checkout": null,
"context": {
"cookiecutter": {
Expand Down Expand Up @@ -36,7 +36,7 @@
".github/workflows/zizmor.yml"
],
"_template": "https://github.com/sunpy/package-template",
"_commit": "2a6434a5c749ecde69d00b937a3fef27ecbad656"
"_commit": "632ed04aee0058dd88dc6b7972ca8f8061fbd6da"
}
},
"directory": null
Expand Down
16 changes: 0 additions & 16 deletions .isort.cfg

This file was deleted.

12 changes: 6 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@ repos:
- id: ruff-format
types: [python]
exclude: *exclude_dirs
- repo: https://github.com/PyCQA/isort
rev: 8.0.1
hooks:
- id: isort
types: [python]
exclude: *exclude_dirs
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v6.0.0
hooks:
Expand Down Expand Up @@ -50,6 +44,12 @@ repos:
args: [ "--write-changes" ]
types_or: [python, rst]
exclude: *exclude_dirs
- repo: https://github.com/sphinx-contrib/sphinx-lint
rev: v1.0.2
hooks:
- id: sphinx-lint
types_or: [python, rst]
exclude: *exclude_dirs
ci:
autofix_prs: false
autoupdate_schedule: "quarterly"
23 changes: 22 additions & 1 deletion .ruff.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ select = [
"W",
"UP",
"PT",
"I",
"BLE",
"A",
"C4",
Expand Down Expand Up @@ -56,7 +57,8 @@ extend-ignore = [
"INP001", # File is part of an implicit namespace package.
]
"docs/conf.py" = [
"E402" # Module imports not at top of file
"E402", # Module imports not at top of file
"I", # isort
]
"docs/*.py" = [
"INP001", # File is part of an implicit namespace package.
Expand All @@ -70,6 +72,7 @@ extend-ignore = [
"F401", # Unused import
"F403", # from {name} import * used; unable to detect undefined names
"F405", # {name} may be undefined, or defined from star imports
"I", # isort
]
"test_*.py" = [
"E402", # Module level import not at top of cell
Expand All @@ -83,3 +86,21 @@ extend-ignore = [

[lint.pydocstyle]
convention = "numpy"

[lint.isort]
default-section = "third-party"
section-order = [
"future",
"standard-library",
"third-party",
"astropy",
"sunpy",
"first-party",
"local-folder",
]
known-first-party = ["drms"]
no-lines-before = ["local-folder"]

[lint.isort.sections]
"astropy" = ["astropy", "asdf", "gwcs", "reproject"]
"sunpy" = ["sunpy"]
2 changes: 1 addition & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ Backwards Incompatible Changes
Deprecations and Removals
-------------------------

- ``Client.get()`` has been removed, use :meth:`drms.client.Client.query()` instead.
- ``Client.get()`` has been removed, use :meth:`drms.client.Client.query` instead.

Support for Processing Keywords
--------------------------------
Expand Down
6 changes: 3 additions & 3 deletions drms/client.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import os
import re
import time
import shutil
import socket
from pathlib import Path
import time
from collections import OrderedDict
from urllib.error import URLError, HTTPError
from pathlib import Path
from urllib.error import HTTPError, URLError
from urllib.parse import urljoin
from urllib.request import urlopen

Expand Down
2 changes: 1 addition & 1 deletion drms/json.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import json as _json
import socket
from enum import Enum
from urllib.parse import urlencode, quote_plus
from urllib.parse import quote_plus, urlencode
from urllib.request import HTTPError, urlopen

from drms import logger
Expand Down
2 changes: 1 addition & 1 deletion drms/main.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import sys
import argparse
import sys


def main():
Expand Down
2 changes: 1 addition & 1 deletion drms/tests/conftest.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import os
from urllib.error import URLError, HTTPError
from urllib.error import HTTPError, URLError
from urllib.request import urlopen

import pytest
Expand Down
Loading