From 0a7db87befe7b51f700010e4ec85beb514766df4 Mon Sep 17 00:00:00 2001 From: jameswilburlewis Date: Thu, 24 Aug 2023 10:20:04 -0700 Subject: [PATCH 1/6] Changed default date to one where data is available --- pyspedas/barrel/__init__.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pyspedas/barrel/__init__.py b/pyspedas/barrel/__init__.py index 1fb8cd46..7c114e1d 100644 --- a/pyspedas/barrel/__init__.py +++ b/pyspedas/barrel/__init__.py @@ -1,6 +1,6 @@ from .load import load -def sspc(trange=['2013-01-17', '2013-01-19'], +def sspc(trange=['2013-01-28', '2013-01-29'], probe='1A', downloadonly=False, no_update=False, @@ -8,7 +8,7 @@ def sspc(trange=['2013-01-17', '2013-01-19'], return load(datatype='sspc', trange=trange, probe=probe, downloadonly=downloadonly, time_clip=time_clip, no_update=no_update) -def mspc(trange=['2013-01-17', '2013-01-19'], +def mspc(trange=['2013-01-29','2013-01-30'], probe='1A', downloadonly=False, no_update=False, @@ -16,7 +16,7 @@ def mspc(trange=['2013-01-17', '2013-01-19'], return load(datatype='mspc', trange=trange, probe=probe, downloadonly=downloadonly, time_clip=time_clip, no_update=no_update) -def fspc(trange=['2013-01-17', '2013-01-19'], +def fspc(trange=['2013-01-29','2013-01-30'], probe='1A', downloadonly=False, no_update=False, @@ -24,7 +24,7 @@ def fspc(trange=['2013-01-17', '2013-01-19'], return load(datatype='fspc',trange=trange, probe=probe, downloadonly=downloadonly, time_clip=time_clip, no_update=no_update) -def rcnt(trange=['2013-01-17', '2013-01-19'], +def rcnt(trange=['2013-01-29','2013-01-30'], probe='1A', downloadonly=False, no_update=False, @@ -32,7 +32,7 @@ def rcnt(trange=['2013-01-17', '2013-01-19'], return load(datatype='rcnt', trange=trange, probe=probe, downloadonly=downloadonly, time_clip=time_clip, no_update=no_update) -def magn(trange=['2013-01-17', '2013-01-19'], +def magn(trange=['2013-01-29','2013-01-30'], probe='1A', downloadonly=False, no_update=False, @@ -40,7 +40,7 @@ def magn(trange=['2013-01-17', '2013-01-19'], return load(datatype='magn', trange=trange, probe=probe, downloadonly=downloadonly, time_clip=time_clip, no_update=no_update) -def ephm(trange=['2013-01-17', '2013-01-19'], +def ephm(trange=['2013-01-29','2013-01-30'], probe='1A', downloadonly=False, no_update=False, @@ -48,7 +48,7 @@ def ephm(trange=['2013-01-17', '2013-01-19'], return load(datatype='ephm', trange=trange, probe=probe, downloadonly=downloadonly, time_clip=time_clip, no_update=no_update) -def hkpg(trange=['2013-01-17', '2013-01-19'], +def hkpg(trange=['2013-01-29','2013-01-30'], probe='1A', downloadonly=False, no_update=False, From 702acff797ef71c2ad797e1128f814592bdccf01 Mon Sep 17 00:00:00 2001 From: jameswilburlewis Date: Thu, 24 Aug 2023 10:23:49 -0700 Subject: [PATCH 2/6] Restoring akebono tests; adding barrel tests --- .github/workflows/pythonpackage.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index c136eb50..768e477c 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -98,7 +98,8 @@ jobs: ST5_DATA_DIR: st5_data/ PYTPLOT_LOGGING_LEVEL: error run: | - # coverage run -a -m pyspedas.akebono.tests.tests + coverage run -a -m pyspedas.akebono.tests.tests + coverage run -a -m pyspedas.barrel.tests.tests coverage run -a -m pyspedas.soho.tests.tests coverage run -a -m pyspedas.de2.tests.tests coverage run -a -m pyspedas.st5.tests.tests From 7bf524e762a166806203202282584b0d8c4dc4ac Mon Sep 17 00:00:00 2001 From: jameswilburlewis Date: Thu, 24 Aug 2023 10:32:04 -0700 Subject: [PATCH 3/6] Adding BARREL_DATA_DIR to environment --- .github/workflows/pythonpackage.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 768e477c..4286f460 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -72,6 +72,7 @@ jobs: COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} SPEDAS_DATA_DIR: data ACE_DATA_DIR: ace_data/ + BARREL_DATA_DIR: barrel_data/ CLUSTER_DATA_DIR: cluster_data/ DSC_DATA_DIR: dsc_data/ CSSWE_DATA_DIR: csswe_data/ From f154b3ed5a537148abb2b09f45c0ef089f476fcc Mon Sep 17 00:00:00 2001 From: jameswilburlewis Date: Thu, 24 Aug 2023 11:04:15 -0700 Subject: [PATCH 4/6] Taking akebono test suite back out; connection attempts from Github timing out for some reason. --- .github/workflows/pythonpackage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 4286f460..d8634fda 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -99,7 +99,7 @@ jobs: ST5_DATA_DIR: st5_data/ PYTPLOT_LOGGING_LEVEL: error run: | - coverage run -a -m pyspedas.akebono.tests.tests + # coverage run -a -m pyspedas.akebono.tests.tests coverage run -a -m pyspedas.barrel.tests.tests coverage run -a -m pyspedas.soho.tests.tests coverage run -a -m pyspedas.de2.tests.tests From 1d07b148753afa96e148c5835ed9545c507577da Mon Sep 17 00:00:00 2001 From: jameswilburlewis Date: Fri, 25 Aug 2023 10:15:35 -0700 Subject: [PATCH 5/6] Bump required version of Python to 3.8 (due to numpy dependency). --- README.md | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d4be45a5..8648b003 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ The Python-based Space Physics Environment Data Analysis Software (PySPEDAS) fra ## Requirements -Python 3.7+ is required. +Python 3.8+ is required. We recommend [Anaconda](https://www.continuum.io/downloads/) which comes with a suite of packages useful for scientific data analysis. Step-by-step instructions for installing Anaconda can be found at: [Windows](https://docs.anaconda.com/anaconda/install/windows/), [macOS](https://docs.anaconda.com/anaconda/install/mac-os/), [Linux](https://docs.anaconda.com/anaconda/install/linux/) diff --git a/setup.py b/setup.py index 33616ba3..95e48919 100755 --- a/setup.py +++ b/setup.py @@ -29,6 +29,6 @@ 'cdflib<1.0.0', 'cdasws>=1.7.24', 'netCDF4>=1.6.2', 'pywavelets', 'astropy', 'hapiclient>=0.2.2', 'pytplot-mpl-temp>=2.1.47', 'viresclient'], - python_requires='>=3.7', + python_requires='>=3.8', include_package_data=True, ) From 90563d8c12bb808b6d9c8f935a094a50dada6145 Mon Sep 17 00:00:00 2001 From: Nick H <34072991+nickssl@users.noreply.github.com> Date: Wed, 6 Sep 2023 10:57:50 -0700 Subject: [PATCH 6/6] Added another link for more information. --- pyspedas/sosmag/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/pyspedas/sosmag/README.md b/pyspedas/sosmag/README.md index cf906f4d..4de44357 100644 --- a/pyspedas/sosmag/README.md +++ b/pyspedas/sosmag/README.md @@ -3,6 +3,7 @@ The routines in this module can be used to load data from the SOSMAG magnetomete For more information, see: - [SOSMAG at the ESA Space Weather Service Network](https://swe.ssa.esa.int/sosmag) +- [Space Weather Magnetometer Aboard GEO-KOMPSAT-2A](https://link.springer.com/article/10.1007/s11214-020-00742-2) The data is loaded using the ESA HAPI server (requires registration): - [ESA HAPI server](https://swe.ssa.esa.int/hapi)