Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master changes into barrel branch #587

Merged
merged 8 commits into from
Sep 8, 2023
2 changes: 2 additions & 0 deletions .github/workflows/pythonpackage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down Expand Up @@ -99,6 +100,7 @@ jobs:
PYTPLOT_LOGGING_LEVEL: error
run: |
# 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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/)

Expand Down
14 changes: 7 additions & 7 deletions pyspedas/barrel/__init__.py
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
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,
time_clip=False):

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,
time_clip=False):

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,
time_clip=False):

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,
time_clip=False):

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,
time_clip=False):

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,
time_clip=False):

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,
Expand Down
1 change: 1 addition & 0 deletions pyspedas/sosmag/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Loading