Skip to content

Commit 5dc8fbd

Browse files
Bump pandas from 2.3.3 to 3.0.0 (#57)
* Bump pandas from 2.3.3 to 3.0.0 Bumps [pandas](https://github.com/pandas-dev/pandas) from 2.3.3 to 3.0.0. - [Release notes](https://github.com/pandas-dev/pandas/releases) - [Commits](pandas-dev/pandas@v2.3.3...v3.0.0) --- updated-dependencies: - dependency-name: pandas dependency-version: 3.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Fix stuff --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nabil Freij <nabil.freij@gmail.com>
1 parent 9f74ee8 commit 5dc8fbd

File tree

7 files changed

+173
-197
lines changed

7 files changed

+173
-197
lines changed

.pre-commit-config.yaml

Lines changed: 34 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,52 @@
1-
exclude: ".*(.fits|.fts|.fit|.txt|.csv)$"
1+
exclude: ".*(.csv|.fits|.fts|.fit|.header|.jpg|.jpeg|.json|.png|.svg)$"
22
repos:
3-
- repo: https://github.com/PyCQA/docformatter
4-
rev: v1.7.7
5-
hooks:
6-
- id: docformatter
7-
args: [--in-place, --pre-summary-newline, --make-summary-multi]
83
- repo: https://github.com/PyCQA/autoflake
94
rev: v2.3.1
105
hooks:
116
- id: autoflake
12-
args: ['--in-place', '--remove-all-unused-imports', '--remove-unused-variable']
13-
exclude: ".*(.fits|.fts|.fit|.txt|tca.*|extern.*|.rst|.md|docs/conf.py)$"
7+
args:
8+
[
9+
"--in-place",
10+
"--remove-all-unused-imports",
11+
"--remove-unused-variable",
12+
]
1413
- repo: https://github.com/astral-sh/ruff-pre-commit
15-
rev: 'v0.14.11'
14+
rev: "v0.14.14"
15+
hooks:
16+
- id: ruff-check
17+
args: ["--fix", "--unsafe-fixes", "--preview"]
18+
- id: ruff-format
19+
args: ["--preview"]
20+
- repo: https://github.com/PyCQA/docformatter
21+
rev: master
22+
hooks:
23+
- id: docformatter
24+
args: ["--make-summary-multi-line", "--pre-summary-newline", "-ri"]
25+
- repo: https://github.com/JoC0de/pre-commit-prettier
26+
rev: v3.8.1
27+
hooks:
28+
- id: prettier
29+
types_or: [css, scss, javascript, rst, json, yaml, toml, markdown]
30+
- repo: https://github.com/pre-commit/pre-commit-hooks
31+
rev: v6.0.0
1632
hooks:
17-
- id: ruff
18-
args: ['--fix', '--unsafe-fixes']
19-
- repo: https://github.com/psf/black-pre-commit-mirror
20-
rev: 25.12.0
21-
hooks:
22-
- id: black
23-
- repo: https://github.com/PyCQA/isort
24-
rev: 7.0.0
25-
hooks:
26-
- id: isort
27-
- repo: https://github.com/pre-commit/pre-commit-hooks
28-
rev: v6.0.0
29-
hooks:
3033
- id: check-ast
3134
- id: check-case-conflict
32-
- id: trailing-whitespace
33-
- id: mixed-line-ending
34-
args: ['--fix=lf']
35-
- id: end-of-file-fixer
35+
- id: check-json
36+
- id: check-toml
3637
- id: check-yaml
3738
- id: debug-statements
39+
- id: end-of-file-fixer
40+
- id: mixed-line-ending
41+
args: ["--fix=lf"]
42+
- id: trailing-whitespace
3843
- repo: https://github.com/codespell-project/codespell
3944
rev: v2.4.1
4045
hooks:
4146
- id: codespell
47+
additional_dependencies:
48+
- tomli
49+
args: ["--write-changes"]
4250
ci:
4351
autofix_prs: false
4452
autoupdate_schedule: "quarterly"

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
# SDO Non-nominal Timeline #
1+
# SDO Non-nominal Timeline
22

3-
## Warning ##
3+
## Warning
44

55
This captures data from multiple sources and is not guaranteed to be accurate.
66
It is intended to be a rough guide to the non-nominal periods of SDO.
77

8-
## Requirements ##
8+
## Requirements
99

1010
Requirements are in `requirements.txt`.
1111

12-
## Notes ##
12+
## Notes
1313

1414
Things to note:
1515

config.py

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1-
from datetime import datetime
1+
"""
2+
Basic configuration file for SDO data scraping.
3+
"""
4+
5+
from datetime import UTC, datetime
26

37
__all__ = ["CY_END", "DATASETS", "MAP_4", "TIME_FORMATS"]
48

5-
CY_END = int(str(datetime.now().year + 1)[2:])
9+
CY_END = int(str(datetime.now(tz=UTC).year + 1)[2:])
610
TIME_FORMATS = [
711
"%d-%b-%y %H:%M:%S", # 06-Apr-10 21:11:55
812
"%Y.%m.%d", # 2010.05.18
9-
"%y-%j-%H:%M:%S", # YY-DOY-HH:MM:SS
13+
"%y-%j-%H:%M:%S", # YY-DOY-HH:MM:SS, 10-096-06:26:28
1014
"%Y.%m.%d_%H:%M:%S", # 2010.11.10_06:01:20
1115
"%d-%b-%Y %H:%M:%S", # 9-Apr-2010 07:30:00
1216
]
@@ -33,26 +37,14 @@
3337
19: "Misc Tests/Special Ops",
3438
}
3539
DATASETS = {
36-
"hmi_obs_cov": {
37-
"fURL": "http://jsoc.stanford.edu/doc/data/hmi/cov2/cov{}.html",
40+
"jsocobs_info": {
41+
"fURL": "https://aia.lmsal.com/public/jsocobs_info{}.html",
3842
"RANGE": range(10, CY_END),
39-
"MONTH_RANGE": range(1, 13),
4043
},
4144
"spacecraft_night": {
4245
"URL": "https://aia.lmsal.com/public/sdo_spacecraft_night.txt",
4346
"SKIP_ROWS": [0, 1, 2, 3],
4447
},
45-
"jsocobs_info": {
46-
"fURL": "https://aia.lmsal.com/public/jsocobs_info{}.html",
47-
"RANGE": range(10, CY_END),
48-
},
49-
# This site has a whole range of text files and its easier to scrape the urls that way.
50-
# Assumption is that each text file on this page has the same structure
51-
"jsocinst_calibrations": {
52-
"URL": "https://aia.lmsal.com/public/jsocinst_calibrations.html",
53-
"SKIP_ROWS": [0],
54-
"SCRAPE": True,
55-
},
5648
"text_block_1": {
5749
"URL": "./data_1.txt",
5850
},
@@ -65,4 +57,16 @@
6557
"text_block_4": {
6658
"URL": "./data_4.txt",
6759
},
60+
"hmi_obs_cov": {
61+
"fURL": "http://jsoc.stanford.edu/doc/data/hmi/cov2/cov{}.html",
62+
"RANGE": range(10, CY_END),
63+
"MONTH_RANGE": range(1, 13),
64+
},
65+
# This site has a whole range of text files and its easier to scrape the urls that way.
66+
# Assumption is that each text file on this page has the same structure
67+
"jsocinst_calibrations": {
68+
"URL": "https://aia.lmsal.com/public/jsocinst_calibrations.html",
69+
"SKIP_ROWS": [0],
70+
"SCRAPE": True,
71+
},
6872
}

pyproject.toml

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

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
beautifulsoup4==4.14.3
2-
pandas==2.3.3
2+
pandas==3.0.0
33
requests==2.32.5
44
loguru==0.7.3

ruff.toml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Allow unused variables when underscore-prefixed.
2+
lint.dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
3+
target-version = "py314"
4+
line-length = 120
5+
extend-exclude=[
6+
"__pycache__",
7+
"build",
8+
"tools/**",
9+
]
10+
lint.select = [
11+
"ALL",
12+
]
13+
lint.ignore = [
14+
"TD",
15+
"FIX",
16+
"CPY001",
17+
]
18+
lint.extend-ignore = [
19+
"COM812", # The following rule may cause conflicts when used with the formatter
20+
]
21+
22+
[lint.pydocstyle]
23+
convention = "numpy"
24+
25+
[format]
26+
docstring-code-format = true
27+
indent-style = "space"
28+
quote-style = "double"

0 commit comments

Comments
 (0)