From ff7c654b560ad83aed2f8f3eb7da461a8f6084d2 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Tue, 7 Oct 2025 09:45:42 +0100 Subject: [PATCH 1/6] Update cruft with batchpr --- .cruft.json | 6 +++--- .github/workflows/ci.yml | 9 +++++---- .github/workflows/sub_package_update.yml | 4 ++-- .pre-commit-config.yaml | 4 ++++ .ruff.toml | 2 -- pyproject.toml | 2 +- tox.ini | 6 ++++++ 7 files changed, 21 insertions(+), 12 deletions(-) diff --git a/.cruft.json b/.cruft.json index 5aa3512..b2ebf7f 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/sunpy/package-template", - "commit": "2d254ec79b0b2d9dfb8d7d08ebd83fa6da234b46", + "commit": "bea8060eef60df35f7df61d9db1d56b838bda01a", "checkout": null, "context": { "cookiecutter": { @@ -17,7 +17,7 @@ "changelog_url": "https://docs.sunpy.org/projects/sunpy-soar/en/stable/whatsnew/changelog.html", "issue_tracker_url": "https://github.com/sunpy/sunpy-soar/issues", "license": "BSD 2-Clause", - "minimum_python_version": "3.10", + "minimum_python_version": "3.12", "use_compiled_extensions": "n", "enable_dynamic_dev_versions": "y", "include_example_code": "n", @@ -32,7 +32,7 @@ ".github/workflows/sub_package_update.yml" ], "_template": "https://github.com/sunpy/package-template", - "_commit": "2d254ec79b0b2d9dfb8d7d08ebd83fa6da234b46" + "_commit": "bea8060eef60df35f7df61d9db1d56b838bda01a" } }, "directory": null diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 88efefa..eee6384 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,7 +44,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v5 + - uses: actions/setup-python@v6 with: python-version: '3.13' - run: python -m pip install -U --user build @@ -61,10 +61,11 @@ jobs: toxdeps: tox-pypi-filter posargs: -n auto envs: | - - windows: py311 + - linux: py314 + - windows: py312 - macos: py312 - - linux: py310-oldestdeps - - linux: py313-devdeps + - linux: py312-oldestdeps + - linux: py314-devdeps secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/sub_package_update.yml b/.github/workflows/sub_package_update.yml index 523cca3..71bf5b9 100644 --- a/.github/workflows/sub_package_update.yml +++ b/.github/workflows/sub_package_update.yml @@ -22,9 +22,9 @@ jobs: strategy: fail-fast: true steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - - uses: actions/setup-python@v5 + - uses: actions/setup-python@v6 with: python-version: "3.11" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index cf40da7..9a45d68 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,7 +1,11 @@ repos: # This should be before any formatting hooks like isort - repo: https://github.com/astral-sh/ruff-pre-commit +<<<<<<< rev: "v0.13.3" +======= + rev: "v0.13.2" +>>>>>>> hooks: - id: ruff args: ["--fix"] diff --git a/.ruff.toml b/.ruff.toml index 4182224..b8df50d 100644 --- a/.ruff.toml +++ b/.ruff.toml @@ -36,8 +36,6 @@ select = [ extend-ignore = [ # pycodestyle (E, W) "E501", # ignore line length will use a formatter instead - # pyupgrade (UP) - "UP038", # Use | in isinstance - not compatible with models and is slower # pytest (PT) "PT001", # Always use pytest.fixture() "PT023", # Always use () on pytest decorators diff --git a/pyproject.toml b/pyproject.toml index 742bb49..0de405c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ build-backend = "setuptools.build_meta" [project] name = "sunpy_soar" description = "A sunpy FIDO plugin for accessing data in the Solar Orbiter Archive (SOAR)." -requires-python = ">=3.10" +requires-python = ">=3.12" readme = { file = "README.rst", content-type = "text/x-rst" } license = { file = "licenses/LICENSE.rst" } authors = [ diff --git a/tox.ini b/tox.ini index 2f73ab2..fb69475 100644 --- a/tox.ini +++ b/tox.ini @@ -3,9 +3,15 @@ min_version = 4.0 requires = tox-pypi-filter>=0.14 envlist = +<<<<<<< py{310,311,312,313} py313-devdeps py310-oldestdeps +======= + py{312,313,314} + py314-devdeps + py312-oldestdeps +>>>>>>> codestyle build_docs From e28b45b61d9545cfeb9591eb0f9c58bb74160e26 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Tue, 7 Oct 2025 10:38:31 +0100 Subject: [PATCH 2/6] Resolve conflicts --- .pre-commit-config.yaml | 4 ---- tox.ini | 6 ------ 2 files changed, 10 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9a45d68..56af576 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,11 +1,7 @@ repos: # This should be before any formatting hooks like isort - repo: https://github.com/astral-sh/ruff-pre-commit -<<<<<<< - rev: "v0.13.3" -======= rev: "v0.13.2" ->>>>>>> hooks: - id: ruff args: ["--fix"] diff --git a/tox.ini b/tox.ini index fb69475..8cedb55 100644 --- a/tox.ini +++ b/tox.ini @@ -3,15 +3,9 @@ min_version = 4.0 requires = tox-pypi-filter>=0.14 envlist = -<<<<<<< - py{310,311,312,313} - py313-devdeps - py310-oldestdeps -======= py{312,313,314} py314-devdeps py312-oldestdeps ->>>>>>> codestyle build_docs From ea33934802a003310f729a8aa012b27ffca04d46 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Tue, 7 Oct 2025 11:13:45 +0100 Subject: [PATCH 3/6] bump checkout --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eee6384..8f32525 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,7 +43,7 @@ jobs: sdist_verify: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: actions/setup-python@v6 with: python-version: '3.13' From 8e12ddc42c45a69eda393e7324a71db5a2409cff Mon Sep 17 00:00:00 2001 From: Nabil Freij Date: Tue, 7 Oct 2025 17:05:36 -0700 Subject: [PATCH 4/6] Changelog --- changelog/190.breaking.rst | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changelog/190.breaking.rst diff --git a/changelog/190.breaking.rst b/changelog/190.breaking.rst new file mode 100644 index 0000000..c5088cf --- /dev/null +++ b/changelog/190.breaking.rst @@ -0,0 +1,4 @@ +Increased minimum version of Python to 3.12. +Increased minimum version of Matplotlib to 3.8.0. +Increased minimum version of Astropy to 6.1.0. +Increased minimum version of sunpy to 7.0.0. From 031b3cdb62281b69fbcb79a54af8f52204f6f8a0 Mon Sep 17 00:00:00 2001 From: Nabil Freij Date: Tue, 7 Oct 2025 17:05:43 -0700 Subject: [PATCH 5/6] Fix tests --- pyproject.toml | 8 ++++---- pytest.ini | 4 ++++ sunpy_soar/tests/test_sunpy_soar.py | 2 +- tools/update_data.py | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 0de405c..9ad9c89 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,9 +17,9 @@ authors = [ { name = "David Stansby"}, ] dependencies = [ - "matplotlib>=3.6.0", - "astropy>=5.3.0", - "sunpy[net]>=6.0.0", + "matplotlib>=3.8.0", + "astropy>=6.1.0", + "sunpy[net]>=7.0.0", "requests>=2.28.0", ] dynamic = ["version"] @@ -31,7 +31,7 @@ tests = [ "pytest-xdist", "pytest", "responses>=0.20.0", - "sunpy[map,net]>=6.0.0", + "sunpy[map,net]>=7.0.0", ] docs = [ "sphinx", diff --git a/pytest.ini b/pytest.ini index ab592c4..4d1d280 100644 --- a/pytest.ini +++ b/pytest.ini @@ -4,6 +4,10 @@ testpaths = sunpy_soar docs norecursedirs = + .git + .tox + .history + tools docs/_build docs/generated sunpy_soar/_dev diff --git a/sunpy_soar/tests/test_sunpy_soar.py b/sunpy_soar/tests/test_sunpy_soar.py index e78181e..c1b5c92 100644 --- a/sunpy_soar/tests/test_sunpy_soar.py +++ b/sunpy_soar/tests/test_sunpy_soar.py @@ -372,6 +372,6 @@ def test_soar_server_down() -> None: with pytest.raises( RuntimeError, - match=("The SOAR server returned an invalid JSON response. It may be down or not functioning correctly."), + match=r"The SOAR server returned an invalid JSON response. It may be down or not functioning correctly.", ): Fido.search(time, level, product) diff --git a/tools/update_data.py b/tools/update_data.py index feb3abb..aedc6ac 100644 --- a/tools/update_data.py +++ b/tools/update_data.py @@ -79,7 +79,7 @@ def get_all_soops(): return soop_names -if __name__ == "__main__": +def main(): attr_file = ( pathlib.Path(__file__).parent.parent / "sunpy_soar" / "data" / "attrs.json" ) From fff212060de20ccbdef2f4b44f385ead7015a9eb Mon Sep 17 00:00:00 2001 From: Nabil Freij Date: Tue, 7 Oct 2025 17:11:19 -0700 Subject: [PATCH 6/6] Tweak values --- docs/dev_guide/query.rst | 16 ++------ pyproject.toml | 2 +- sunpy_soar/data/attrs.json | 59 ++++++++++++++++++++--------- sunpy_soar/tests/test_sunpy_soar.py | 2 +- tools/update_data.py | 2 +- 5 files changed, 47 insertions(+), 34 deletions(-) diff --git a/docs/dev_guide/query.rst b/docs/dev_guide/query.rst index 2ad7b70..8756ee0 100644 --- a/docs/dev_guide/query.rst +++ b/docs/dev_guide/query.rst @@ -31,23 +31,13 @@ Using the example below, Results from 1 Provider: - 357 Results from the SOARClient: + 680 Results from the SOARClient: Instrument Data product Level Start time End time Filesize SOOP Name Mbyte ---------- ------------------- ----- ----------------------- ----------------------- -------- --------- - RPW rpw-tds-surv-tswf-b L2 2022-10-09 00:00:00.000 2022-10-10 00:00:00.000 13.748 None - RPW rpw-lfr-surv-bp1 L2 2022-10-09 00:00:00.000 2022-10-10 00:00:00.000 61.818 None - RPW rpw-tds-surv-tswf-e L2 2022-10-09 00:00:00.000 2022-10-10 00:00:00.000 95.65 None - RPW rpw-lfr-surv-bp2 L2 2022-10-09 00:00:00.000 2022-10-10 00:00:00.000 145.551 None - RPW rpw-lfr-surv-swf-e L2 2022-10-09 00:00:00.000 2022-10-10 00:00:00.000 47.452 None - ... ... ... ... ... ... ... - RPW rpw-tds-surv-stat L2 2023-10-10 00:00:00.000 2023-10-11 00:00:00.000 0.531 None - RPW rpw-tds-surv-hist2d L2 2023-10-10 00:00:00.000 2023-10-11 00:00:00.000 3.382 None - RPW rpw-tnr-surv L2 2023-10-10 00:00:00.000 2023-10-11 00:00:00.000 341.182 None - RPW rpw-lfr-surv-swf-e L2 2023-10-10 00:00:00.000 2023-10-11 00:00:00.000 200.206 None - RPW rpw-tds-surv-tswf-e L2 2023-10-10 00:00:00.000 2023-10-11 00:00:00.000 173.184 None - Length = 357 rows + RPW rpw-tds-surv-hist2d L2 2022-10-09 00:00:00.000 2022-10-10 00:00:00.000 0.084 none + ... diff --git a/pyproject.toml b/pyproject.toml index 9ad9c89..fbe2590 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,7 +20,7 @@ dependencies = [ "matplotlib>=3.8.0", "astropy>=6.1.0", "sunpy[net]>=7.0.0", - "requests>=2.28.0", + "requests>=2.32.0", ] dynamic = ["version"] diff --git a/sunpy_soar/data/attrs.json b/sunpy_soar/data/attrs.json index e35b6a5..bd74d2b 100644 --- a/sunpy_soar/data/attrs.json +++ b/sunpy_soar/data/attrs.json @@ -3,6 +3,8 @@ "RPW-SBM2": "Solar Orbiter Radio/Plasma Wave, LL01 parameters", "RPW-TNR": "Solar Orbiter Radio/Plasma Wave, LL01 parameters", "SOC-ORBIT": "Solar Orbiter SOC Ancillary Orbit Data", + "epd-ept-1day": "Solar Orbiter, Level 3 Data, Energetic Particle Detector, Electron Proton Telescope, 1 day resolution data", + "epd-ept-1hour": "Solar Orbiter, Level 3 Data, Energetic Particle Detector, Electron Proton Telescope, 1 hour resolution data", "epd-ept-1min": "Solar Orbiter, Level 3 Data, Energetic Particle Detector, Electron Proton Telescope, 1 minute resolution data", "epd-ept-asun-burst-ele-close": "Solar Orbiter, Level 2 Data, Energetic Particle Detector, Electron Proton Telescope, Anti-Sun direction, Burst, Electrons, Close mode", "epd-ept-asun-burst-ion": "Solar Orbiter, Level 2 Data, Energetic Particle Detector, Electron Proton Telescope, Anti-Sun direction, Burst, Ions", @@ -87,6 +89,7 @@ "eui-hrieuvopn-image": "", "eui-hrieuvopn-image-dark": "", "eui-hrieuvopn-image-led": "", + "eui-hrieuvopn-image-short": "", "eui-hrieuvzer-image": "", "eui-hrieuvzer-image-dark": "", "eui-hrieuvzer-image-led": "", @@ -114,6 +117,10 @@ "metis-vl-pol-angle": "", "metis-vl-stokes": "", "metis-vl-tb": "", + "multi-mag-rpw-scm-merged-rtn-256": "Solar Orbiter, Level 3, MAG and RPW, Merged magnetic data sampled at 256 Hz", + "multi-mag-rpw-scm-merged-rtn-4096": "Solar Orbiter, Level 3, MAG and RPW, Merged magnetic data sampled at 4096 Hz", + "multi-mag-rpw-scm-merged-srf-256": "Solar Orbiter, Level 3, MAG and RPW, Merged magnetic data sampled at 256 Hz", + "multi-mag-rpw-scm-merged-srf-4096": "Solar Orbiter, Level 3, MAG and RPW, Merged magnetic data sampled at 4096 Hz", "phi-fdt-bazi": "", "phi-fdt-binc": "", "phi-fdt-blos": "", @@ -142,33 +149,33 @@ "rpw-bia-scpot-10-seconds-cdag": "Solar Orbiter Radio/Plasma Wave, LFR L3 spacecraft potential, downsampled", "rpw-bia-scpot-cdag": "Solar Orbiter Radio/Plasma Wave, LFR L3 spacecraft potential", "rpw-bia-vht": "Solar Orbiter Radio/Plasma Wave, LFR L3 de Hoffmann-Teller solar wind velocity", - "rpw-hfr-surv": "Solar Orbiter Radio/Plasma Wave, HFR L2 parameters", - "rpw-lfr-surv-asm": "Solar Orbiter Radio/Plasma Wave, LFR L2 parameters", - "rpw-lfr-surv-bp1": "Solar Orbiter Radio/Plasma Wave, LFR L2 parameters", - "rpw-lfr-surv-bp2": "Solar Orbiter Radio/Plasma Wave, LFR L2 parameters", - "rpw-lfr-surv-cwf": "Solar Orbiter Radio/Plasma Wave, LFR L1 parameters", + "rpw-hfr-surv": "Solar Orbiter, Level 2, Radio and Plasma Waves, High Frequency Receiver, Spectral data in survey mode (calibrated)", + "rpw-lfr-surv-asm": "Solar Orbiter, Level L1, Radio and Plasma Waves, Low Frequency Receiver, Averaged spectral matrices in survey mode (uncalibrated)", + "rpw-lfr-surv-bp1": "Solar Orbiter, Level L2, Radio and Plasma Waves, Low Frequency Receiver, Basic Parameters set 1 in survey mode (calibrated)", + "rpw-lfr-surv-bp2": "Solar Orbiter, Level L2, Radio and Plasma Waves, Low Frequency Receiver, Basic Parameters set 2 in survey mode (calibrated)", + "rpw-lfr-surv-cwf": "Solar Orbiter, Level L1, Radio and Plasma Waves, Low Frequency Receiver, Continuous waveforms in survey mode (uncalibrated)", "rpw-lfr-surv-cwf-b": "Solar Orbiter, Level 2, Radio and Plasma Waves, Low Frequency Receiver, Continous Waveform of magnetic data in survey mode", - "rpw-lfr-surv-cwf-e": "Solar Orbiter Radio/Plasma Wave, LFR L2 electric parameters", + "rpw-lfr-surv-cwf-e": "Solar Orbiter, Level 2, Radio and Plasma Waves, Low Frequency Reciever, Survey mode, Continuous Waveform, Electric component", "rpw-lfr-surv-cwf-e-cdag": "Solar Orbiter Radio/Plasma Wave, LFR L2 electric parameters", - "rpw-lfr-surv-swf": "Solar Orbiter Radio/Plasma Wave, LFR L1 parameters", + "rpw-lfr-surv-swf": "Solar Orbiter, Level L1, Radio and Plasma Waves, Low Frequency Receiver, Snapshot waveforms in survey mode (uncalibrated)", "rpw-lfr-surv-swf-b": "Solar Orbiter, Level 2, Radio and Plasma Waves, Low Frequency Receiver, Snapshot Waveform of magnetic data in survey mode", - "rpw-lfr-surv-swf-e": "Solar Orbiter Radio/Plasma Wave, LFR L2 electric parameters", + "rpw-lfr-surv-swf-e": "Solar Orbiter, Level 2, Radio and Plasma Waves, Low Frequency Reciever, Survey mode, Snapshot Waveform, Electric component", "rpw-lfr-surv-swf-e-cdag": "Solar Orbiter Radio/Plasma Wave, LFR L2 electric parameters", "rpw-sbm1": "Solar Orbiter Radio/Plasma Wave, LL02 parameters", "rpw-sbm2": "Solar Orbiter Radio/Plasma Wave, LL02 parameters", - "rpw-tds-surv-hist1d": "Solar Orbiter Radio/Plasma Wave, TDS L2 parameters", - "rpw-tds-surv-hist2d": "Solar Orbiter Radio/Plasma Wave, TDS L2 parameters", - "rpw-tds-surv-mamp": "Solar Orbiter Radio/Plasma Wave, TDS L2 parameters", - "rpw-tds-surv-rswf": "Solar Orbiter Radio/Plasma Wave, TDS L1 parameters", + "rpw-tds-surv-hist1d": "Solar Orbiter, Level L1, Radio and Plasma Waves, Time Domain Sampler, 1D histograms in survey mode (uncalibrated)", + "rpw-tds-surv-hist2d": "Solar Orbiter, Level 2, Radio and Plasma Wave, Time Domain Sampler, 2D histogram, survey", + "rpw-tds-surv-mamp": "Solar Orbiter, Level L1, Radio and Plasma Waves, Time Domain Sampler, Maximum amplitude data in survey mode (uncalibrated)", + "rpw-tds-surv-rswf": "Solar Orbiter, Level L1, Radio and Plasma Waves, Time Domain Sampler, Regular snapshot waveforms in survey mode (uncalibrated)", "rpw-tds-surv-rswf-b": "Solar Orbiter, Level 2, Radio and Plasma Waves, Time Domain Sampler, Regular Snapshot Waveform of magnetic data in survey mode", - "rpw-tds-surv-rswf-e": "Solar Orbiter Radio/Plasma Wave, TDS L2 waveform snapshots", - "rpw-tds-surv-stat": "Solar Orbiter Radio/Plasma Wave, TDS L2R parameters", - "rpw-tds-surv-tswf": "Solar Orbiter Radio/Plasma Wave, TDS L1 parameters", + "rpw-tds-surv-rswf-e": "Solar Orbiter, Level 2, Radio and Plasma Wave, Time Domain Sampler, waveform snapshots, survey", + "rpw-tds-surv-stat": "Solar Orbiter, Level L1, Radio and Plasma Waves, Time Domain Sampler, statistics data in survey mode (uncalibrated)", + "rpw-tds-surv-tswf": "Solar Orbiter, Level 1, Radio and Plasma Waves, Time Domain Sampler, Triggered snapshot waveforms in survey mode (uncalibrated)", "rpw-tds-surv-tswf-b": "Solar Orbiter, Level 2, Radio and Plasma Waves, Time Domain Sampler, Triggered Snapshot Waveform of magnetic data in survey mode", - "rpw-tds-surv-tswf-e": "Solar Orbiter Radio/Plasma Wave, TDS L2 waveform snapshots", + "rpw-tds-surv-tswf-e": "Solar Orbiter, Level 2, Radio and Plasma Wave, Time Domain Sampler, waveform snapshots, survey", "rpw-tnr": "Solar Orbiter Radio/Plasma Wave, LL02 parameters", "rpw-tnr-fp": "Solar Orbiter Radio/Plasma Wave, data from plasma peak tracking L3", - "rpw-tnr-surv": "Solar Orbiter Radio/Plasma Wave, TNR L2 parameters", + "rpw-tnr-surv": "Solar Orbiter, Level L1, Radio and Plasma Waves, Thermal Noise Receiver, Spectral data in survey mode (uncalibrated)", "sensorrates": "solo_L1_swa-his-sensor_rates", "solohi-11s": "", "solohi-11t": "", @@ -228,7 +235,7 @@ "stix-sci-xray-vis": "", "stix-sci-xray-vis-sup1": "", "swa-eas-PartMoms": "SWA-EAS Partial Moments data", - "swa-eas-nmpad-psd": "SWA-EAS pitch angles from 3D psd data", + "swa-eas-nmpad-psd": "Solar Orbiter, Level L3, Solar Wind Analyser, Electron Analyser System, Nominal mode pitch angle distributions in PSD units", "swa-eas-pad-def": "Solar Orbiter, Level L2, Solar Wind Analyser, Electron Analyser System, Pitch Angle Distributions, Differential Energy Flux", "swa-eas-pad-dnf": "Solar Orbiter, Level L2, Solar Wind Analyser, Electron Analyser System, Pitch Angle Distributions, Differential Number Flux", "swa-eas-pad-psd": "Solar Orbiter, Level L2, Solar Wind Analyser, Electron Analyser System, Pitch Angle Distributions, Phase Space Density", @@ -237,6 +244,10 @@ "swa-eas1-NM3D": "SWA-EAS1 Nominal Mode 3D data", "swa-eas1-SSc": "SWA-EAS1 Single Strahl data", "swa-eas1-eflux": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 1, Energy Flux", + "swa-eas1-hires3d": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 1, High Resolution Nominal Mode 3D", + "swa-eas1-hires3d-def": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 1, High Resolution Nominal Mode 3D, Differential Energy Flux", + "swa-eas1-hires3d-dnf": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 1, High Resolution Nominal Mode 3D, Differential Number Flux", + "swa-eas1-hires3d-psd": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 1, High Resolution Nominal Mode 3D, Phase Space Density", "swa-eas1-nm3d": "Solar Orbiter, Level L1, Solar Wind Analyzer, Electron Analyser System 1, Nominal Mode 3D", "swa-eas1-nm3d-def": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 1, Nominal Mode 3D, Differential Energy Flux", "swa-eas1-nm3d-dnf": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 1, Nominal Mode 3D, Differential Number Flux", @@ -245,9 +256,17 @@ "swa-eas1-ss-dnf": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 1, Single Energy Strahl, Differential Number Flux", "swa-eas1-ss-psd": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 1, Single Energy Strahl, Phase Space Density", "swa-eas1-ssc": "Solar Orbiter, Level L1, Solar Wind Analyzer, Electron Analyser System 1, Single Energy Strahl Counts", + "swa-eas1-tm3d": "Solar Orbiter, Level L1, Solar Wind Analyzer, Electron Analyser System 1, Trigger Mode 3D", + "swa-eas1-tm3d-def": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 1, Trigger Mode 3D, Differential Number Flux", + "swa-eas1-tm3d-dnf": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 1, Trigger Mode 3D, Differential Number Flux", + "swa-eas1-tm3d-psd": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 1, Trigger Mode 3D, Phase Space Density", "swa-eas2-NM3D": "SWA-EAS2 Nominal Mode 3D data", "swa-eas2-SSc": "SWA-EAS2 Single Strahl data", "swa-eas2-eflux": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 2, Energy Flux", + "swa-eas2-hires3d": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 2, High Resolution Nominal Mode 3D", + "swa-eas2-hires3d-def": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 2, High Resolution Nominal Mode 3D, Differential Energy Flux", + "swa-eas2-hires3d-dnf": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 2, High Resolution Nominal mode 3D, Differential Number Flux", + "swa-eas2-hires3d-psd": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 2, High Resolution Nominal Mode 3D, Phase Space Density", "swa-eas2-nm3d": "Solar Orbiter, Level L1, Solar Wind Analyzer, Electron Analyser System 2, Nominal Mode 3D", "swa-eas2-nm3d-def": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 2, Nominal Mode 3D, Differential Energy Flux", "swa-eas2-nm3d-dnf": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 2, Differential Number Flux", @@ -256,6 +275,10 @@ "swa-eas2-ss-dnf": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 2, Single Energy Strahl, Differential Number Flux", "swa-eas2-ss-psd": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 2, Single Energy Strahl, Phase Space Density", "swa-eas2-ssc": "Solar Orbiter, Level L1, Solar Wind Analyzer, Electron Analyser System 2, Single Energy Strahl Counts", + "swa-eas2-tm3d": "Solar Orbiter, Level L1, Solar Wind Analyzer, Electron Analyser System 2, Trigger Mode 3D", + "swa-eas2-tm3d-def": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 2, Trigger Mode 3D, Differential Energy Flux", + "swa-eas2-tm3d-dnf": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 2, Trigger Mode 3D, Differential Number Flux", + "swa-eas2-tm3d-psd": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 2, Trigger Mode 3D, Phase Space Density", "swa-his-comp-10min": "Solar Orbiter, Level 3 Data, Solar Wind Analyser, Heavy Ion Sensor Composition 10 Minute Resolution", "swa-his-hk": "Solar Orbiter Level 2 Solar Wind Analyser Heavy Ion Sensor Housekeeping Parameters", "swa-his-pha": "Solar Orbiter Level 2 Solar Wind Analyser Heavy Ion Sensor Pulse Height Analyzed", diff --git a/sunpy_soar/tests/test_sunpy_soar.py b/sunpy_soar/tests/test_sunpy_soar.py index c1b5c92..338e52e 100644 --- a/sunpy_soar/tests/test_sunpy_soar.py +++ b/sunpy_soar/tests/test_sunpy_soar.py @@ -311,7 +311,7 @@ def test_distance_search_remote_sensing(): level = a.Level(2) distance = a.soar.Distance(0.28 * u.AU, 0.30 * u.AU) res = Fido.search(distance & instrument & product & level) - assert res.file_num == 35 + assert res.file_num == 40 def test_distance_search_insitu(): diff --git a/tools/update_data.py b/tools/update_data.py index aedc6ac..feb3abb 100644 --- a/tools/update_data.py +++ b/tools/update_data.py @@ -79,7 +79,7 @@ def get_all_soops(): return soop_names -def main(): +if __name__ == "__main__": attr_file = ( pathlib.Path(__file__).parent.parent / "sunpy_soar" / "data" / "attrs.json" )