diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 3d9f398..3522b6c 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -13,13 +13,13 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.10"] + python-version: ["3.11"] name: Documentation tests steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6d13262..d6efa7d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,13 +16,13 @@ jobs: fail-fast: false matrix: os: ["ubuntu-latest", "macos-latest", "windows-latest"] - python-version: ["3.10", "3.11"] + python-version: ["3.10", "3.11", "3.12"] numpy_ver: ["latest"] test_config: ["latest"] include: # NEP29 compliance settings - python-version: "3.9" - numpy_ver: "1.21" + numpy_ver: "1.23" os: ubuntu-latest test_config: "NEP29" # Operational compliance settings @@ -34,9 +34,9 @@ jobs: name: Python ${{ matrix.python-version }} on ${{ matrix.os }} with numpy ${{ matrix.numpy_ver }} runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/pip_rc_install.yml b/.github/workflows/pip_rc_install.yml index 1cbfe44..322ed53 100644 --- a/.github/workflows/pip_rc_install.yml +++ b/.github/workflows/pip_rc_install.yml @@ -13,14 +13,14 @@ jobs: fail-fast: false matrix: os: ["ubuntu-latest", "macos-latest", "windows-latest"] - python-version: ["3.11"] # Keep this version at the highest supported Python version + python-version: ["3.12"] # Keep this version at the highest supported Python version name: Python ${{ matrix.python-version }} on ${{ matrix.os }} runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/pysat_rc.yml b/.github/workflows/pysat_rc.yml index f3e4a6e..3fe807c 100644 --- a/.github/workflows/pysat_rc.yml +++ b/.github/workflows/pysat_rc.yml @@ -12,14 +12,14 @@ jobs: fail-fast: false matrix: os: ["ubuntu-latest", "macos-latest", "windows-latest"] - python-version: ["3.10"] + python-version: ["3.11"] name: Python ${{ matrix.python-version }} on ${{ matrix.os }} runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} diff --git a/.readthedocs.yml b/.readthedocs.yml index e166702..b198cf8 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -9,7 +9,7 @@ version: 2 build: os: ubuntu-22.04 tools: - python: "3.10" + python: "3.11" # Build documentation in the docs/ directory with Sphinx sphinx: diff --git a/ACKNOWLEDGEMENTS.md b/ACKNOWLEDGEMENTS.md new file mode 100644 index 0000000..1608625 --- /dev/null +++ b/ACKNOWLEDGEMENTS.md @@ -0,0 +1,25 @@ +Funding +======= +The following institutions, missions, and programs have provided funding +for pysatSpaceWeather development. + +Institutions +------------ + - The Catholic University of America (CUA) + - Cosmic Studio + - Defense Advanced Research Projects Agency (DARPA) Defense Sciences Office + - National Aeronautics and Space Administration (NASA) + - National Science Foundation (NSF) + - Office of Naval Research (ONR) + +Programs +-------- + - NSF 125908, AGS-1651393 + - Naval Research Laboratory N00173191G016 and N0017322P0744 + - The Space Precipitation Impacts (SPI) project at Goddard Space Flight Center through the Heliophysics Internal Science Funding Model + +Disclaimers +=========== +Any opinions or actions taken by the listed funding institutions are those of the institutions and do not necessarily reflect the views of the pysat development team or individual authors. Any opinions, findings, and conclusions or recommendations expressed in this +material are those of the author(s) and do not necessarily reflect the views +of the funding agencies. diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d95289..b31c4d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,10 +3,15 @@ Change Log All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/). -[0.1.0] - 2023-XX-XX +[0.1.X] - 2024-XX-XX +-------------------- +* Maintenance + * Removed unneeded keyword arguments from Kp method functions + +[0.1.0] - 2024-02-16 -------------------- * Enhancements - * Changed downloads to write files across multiple Instruments, when the + * Changed downloads to write files across multiple Instruments when the remote files contain a mix of data products * Added new instruments: sw_ae, sw_al, sw_au, sw_ap, sw_apo, sw_cp, sw_flare, sw_hpo, sw_polar-cap, sw_sbfield, sw_ssn, and sw_storm-prob @@ -15,13 +20,15 @@ This project adheres to [Semantic Versioning](https://semver.org/). * Added new examples to the documentation * Added new test attributes for clean messages to the ACE instruments * Added the ability to 'download' files from a local directory + * Added an acknowledgements file with detailed funding information * Maintenance * Updated package documentation, yamls, and other supporting files * Updated the LISIRD download routine to reflect new behaviour * Changed F10.7 daily test day to ensure new pysat padding tests work * Removed try/except loop that was a fix for pysat < 3.1.0 * Updated 'use_header' kwarg use for pysat 3.2.0 changes - * Removed unneeded keyword arguments from Kp method functions + * Updated code headers to include license, reference, and pub release info + * Updated the supported python versions [0.0.10] - 2023-06-01 --------------------- diff --git a/README.md b/README.md index c28ab29..88f5149 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,8 @@ a local install use the "--user" flag after "install". ``` cd pysatSpaceWeather/ -python setup.py install +python -m build . +pip install . ``` # Examples diff --git a/docs/acknowledgements.rst b/docs/acknowledgements.rst new file mode 100644 index 0000000..dd1f917 --- /dev/null +++ b/docs/acknowledgements.rst @@ -0,0 +1 @@ +.. mdinclude:: ../ACKNOWLEDGEMENTS.md diff --git a/docs/conf.py b/docs/conf.py index 975bccd..e35e7b2 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -71,7 +71,7 @@ version = info.project['version'].base_version # The full version, including alpha/beta/rc tags. -release = '{:s}-alpha'.format(version) +release = '{:s}-beta'.format(version) # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/index.rst b/docs/index.rst index 6b5cb9d..c927597 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -19,6 +19,12 @@ indices as pysat.Instrument objects. examples.rst develop_guide.rst history.rst + acknowledgements.rst + + +.. admonition:: DISTRIBUTION STATEMENT A: Approved for public release. + Distribution is unlimited. + Indices and tables diff --git a/docs/installation.rst b/docs/installation.rst index 748d3e3..35c0eda 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -19,7 +19,7 @@ Prerequisites pysatSpaceWeather uses common Python modules, as well as modules developed by and for the Space Physics community. This module officially supports -Python 3.7+. +Python 3.6 and 3.9+. ============== ================= Common modules Community modules diff --git a/docs/supported_instruments.rst b/docs/supported_instruments.rst index 69cec7f..efb508a 100644 --- a/docs/supported_instruments.rst +++ b/docs/supported_instruments.rst @@ -84,7 +84,7 @@ AE ^^^ AE is an auroral electrojet index that reflects the level of magnetic deflection -in the auroral zone, due to the difference between the eastward and westward +in the auroral zone due to the difference between the eastward and westward electroject currents at Earth. Real-time predictions (last 96 hours) are provided by `LASP `_. @@ -132,7 +132,7 @@ Ap ^^^ Ap is a geomagnetic index that reflects the magnitude of geomagnetic -disturbances at Earth, but unlike the Kp uses a linear scale. Historic, recent +disturbances at Earth but unlike Kp uses a linear scale. Historic, recent (last 30 days), and forecasted values are available from `GFZ `_ and the `SWPC Forecasts page `_. @@ -148,7 +148,7 @@ apo ^^^ apo is a linear (half)-hourly, planetary, open-ended, geomagnetic index that -reflects the magnitude of geomagnetic disturbances at Earth. It is like Ap, but +reflects the magnitude of geomagnetic disturbances at Earth. It is like Ap but does not have an upper limit. Values from 1995 onwards are available from `GFZ `_. @@ -214,7 +214,7 @@ Historic indices, real-time indices, and forecasted indices are available from Solar Flares ^^^^^^^^^^^^ -Solar flares have been monitored for decades, and the data has been compiled +Solar flares have been monitored for decades and the data has been compiled into standard measurements from different data sets. Historic indices, real-time indices, and forecasted indices are available from `SWPC `_. @@ -229,8 +229,8 @@ real-time indices, and forecasted indices are available from Hpo ^^^ -Hpo is a (half)-Hourly, Planetary, Open-ended, geomagnetic index that -reflects the magnitude of geomagnetic disturbances at Earth. It is like Kp, but +Hpo is a (half)-Hourly, planetary, open-ended, geomagnetic index that +reflects the magnitude of geomagnetic disturbances at Earth. It is like Kp but does not have an upper limit. Values from 1995 onwards are available from `GFZ `_. @@ -276,7 +276,7 @@ Polar Cap Polar cap indices have been developed to provide information about high-latitude conditions and inform ionospheric space weather models. Currently, this -Instrument provides absorption predictions from SWPC. +:py:class:`~pysat._instrument.Instrument` provides absorption predictions from SWPC. .. automodule:: pysatSpaceWeather.instruments.sw_polarcap :members: diff --git a/pyproject.toml b/pyproject.toml index d842da2..fe8ae65 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "pysatSpaceWeather" -version = "0.0.10" +version = "0.1.0" description = 'pysat support for Space Weather Indices' readme = "README.md" requires-python = ">=3.6" @@ -13,7 +13,7 @@ authors = [ {name = "Angeline Burrell", email = "pysat.developers@gmail.com"} ] classifiers = [ - "Development Status :: 3 - Alpha", + "Development Status :: 4 - Beta", "Topic :: Scientific/Engineering :: Astronomy", "Topic :: Scientific/Engineering :: Physics", "Topic :: Scientific/Engineering :: Atmospheric Science", @@ -22,10 +22,10 @@ classifiers = [ "Natural Language :: English", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.6", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Operating System :: POSIX :: Linux", "Operating System :: MacOS :: MacOS X", "Operating System :: Microsoft :: Windows" @@ -81,6 +81,7 @@ markers = [ "download", "no_download", "load_options", + "new_tests", "first", "second" ] diff --git a/pysatSpaceWeather/instruments/ace_epam.py b/pysatSpaceWeather/instruments/ace_epam.py index 40ddf5d..ae439c6 100644 --- a/pysatSpaceWeather/instruments/ace_epam.py +++ b/pysatSpaceWeather/instruments/ace_epam.py @@ -1,4 +1,12 @@ -# -*- coding: utf-8 -*- +#!/usr/bin/env python +# -*- coding: utf-8 -*-. +# Full license can be found in License.md +# Full author list can be found in .zenodo.json file +# DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. +# ---------------------------------------------------------------------------- """Supports ACE Electron, Proton, and Alpha Monitor data. Properties diff --git a/pysatSpaceWeather/instruments/ace_mag.py b/pysatSpaceWeather/instruments/ace_mag.py index cfccde8..27e82fb 100644 --- a/pysatSpaceWeather/instruments/ace_mag.py +++ b/pysatSpaceWeather/instruments/ace_mag.py @@ -1,4 +1,12 @@ -# -*- coding: utf-8 -*- +#!/usr/bin/env python +# -*- coding: utf-8 -*-. +# Full license can be found in License.md +# Full author list can be found in .zenodo.json file +# DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. +# ---------------------------------------------------------------------------- """Supports ACE Magnetometer data. Properties diff --git a/pysatSpaceWeather/instruments/ace_sis.py b/pysatSpaceWeather/instruments/ace_sis.py index 32147ac..61f6546 100644 --- a/pysatSpaceWeather/instruments/ace_sis.py +++ b/pysatSpaceWeather/instruments/ace_sis.py @@ -1,4 +1,12 @@ -# -*- coding: utf-8 -*- +#!/usr/bin/env python +# -*- coding: utf-8 -*-. +# Full license can be found in License.md +# Full author list can be found in .zenodo.json file +# DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. +# ---------------------------------------------------------------------------- """Supports ACE Solar Isotope Spectrometer data. Properties diff --git a/pysatSpaceWeather/instruments/ace_swepam.py b/pysatSpaceWeather/instruments/ace_swepam.py index d3178f5..174d424 100644 --- a/pysatSpaceWeather/instruments/ace_swepam.py +++ b/pysatSpaceWeather/instruments/ace_swepam.py @@ -1,4 +1,12 @@ -# -*- coding: utf-8 -*- +#!/usr/bin/env python +# -*- coding: utf-8 -*-. +# Full license can be found in License.md +# Full author list can be found in .zenodo.json file +# DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. +# ---------------------------------------------------------------------------- """Supports ACE Solar Wind Electron Proton Alpha Monitor data. Properties diff --git a/pysatSpaceWeather/instruments/methods/ace.py b/pysatSpaceWeather/instruments/methods/ace.py index ab180ac..83f756f 100644 --- a/pysatSpaceWeather/instruments/methods/ace.py +++ b/pysatSpaceWeather/instruments/methods/ace.py @@ -3,6 +3,9 @@ # Full license can be found in License.md # Full author list can be found in .zenodo.json file # DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. # ---------------------------------------------------------------------------- """Provides general routines for the ACE space weather instruments.""" @@ -212,7 +215,7 @@ def download(date_array, name, tag='', inst_id='', data_path='', now=None, date_array[0].day != now.day]): logger.warning(''.join(['real-time data only available for current', ' day, data in this file will have the ', - 'wrong date'])) + 'wrong date.'])) else: data_rate = 1 if name in ['mag', 'swepam'] else 5 file_fmt = '_'.join(["%Y%m%d", "ace", name, diff --git a/pysatSpaceWeather/instruments/methods/auroral_electrojet.py b/pysatSpaceWeather/instruments/methods/auroral_electrojet.py index 6283544..2c0b179 100644 --- a/pysatSpaceWeather/instruments/methods/auroral_electrojet.py +++ b/pysatSpaceWeather/instruments/methods/auroral_electrojet.py @@ -1,4 +1,12 @@ +#!/usr/bin/env python # -*- coding: utf-8 -*-. +# Full license can be found in License.md +# Full author list can be found in .zenodo.json file +# DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. +# ---------------------------------------------------------------------------- """Provides support routines for auroral electrojet indices.""" diff --git a/pysatSpaceWeather/instruments/methods/dst.py b/pysatSpaceWeather/instruments/methods/dst.py index 0eee65a..b4831a6 100644 --- a/pysatSpaceWeather/instruments/methods/dst.py +++ b/pysatSpaceWeather/instruments/methods/dst.py @@ -1,4 +1,12 @@ +#!/usr/bin/env python # -*- coding: utf-8 -*-. +# Full license can be found in License.md +# Full author list can be found in .zenodo.json file +# DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. +# ---------------------------------------------------------------------------- """Provides default routines for Dst.""" diff --git a/pysatSpaceWeather/instruments/methods/f107.py b/pysatSpaceWeather/instruments/methods/f107.py index 775cef7..3fe7edf 100644 --- a/pysatSpaceWeather/instruments/methods/f107.py +++ b/pysatSpaceWeather/instruments/methods/f107.py @@ -3,6 +3,9 @@ # Full license can be found in License.md # Full author list can be found in .zenodo.json file # DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. # ---------------------------------------------------------------------------- """Routines for the F10.7 solar index.""" diff --git a/pysatSpaceWeather/instruments/methods/general.py b/pysatSpaceWeather/instruments/methods/general.py index eea99d2..eccccbe 100644 --- a/pysatSpaceWeather/instruments/methods/general.py +++ b/pysatSpaceWeather/instruments/methods/general.py @@ -1,4 +1,12 @@ +#!/usr/bin/env python # -*- coding: utf-8 -*-. +# Full license can be found in License.md +# Full author list can be found in .zenodo.json file +# DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. +# ---------------------------------------------------------------------------- """Provides routines that support general space weather instruments.""" import importlib diff --git a/pysatSpaceWeather/instruments/methods/gfz.py b/pysatSpaceWeather/instruments/methods/gfz.py index 6ff684f..12ffceb 100644 --- a/pysatSpaceWeather/instruments/methods/gfz.py +++ b/pysatSpaceWeather/instruments/methods/gfz.py @@ -3,6 +3,9 @@ # Full license can be found in License.md # Full author list can be found in .zenodo.json file # DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. # ---------------------------------------------------------------------------- """Provides routines that support GFZ space weather instruments.""" diff --git a/pysatSpaceWeather/instruments/methods/kp_ap.py b/pysatSpaceWeather/instruments/methods/kp_ap.py index 01d9ce6..efc2eec 100644 --- a/pysatSpaceWeather/instruments/methods/kp_ap.py +++ b/pysatSpaceWeather/instruments/methods/kp_ap.py @@ -3,6 +3,9 @@ # Full license can be found in License.md # Full author list can be found in .zenodo.json file # DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. # ---------------------------------------------------------------------------- """Provides routines to support the geomagnetic indices, Kp and Ap.""" @@ -584,11 +587,19 @@ def combine_kp(standard_inst=None, recent_inst=None, forecast_inst=None, "provide starting and ending times"))) # Initialize the output instrument - kp_inst = pysat.Instrument() + # TODO(#136): Remove if/else when pysat is 3.2.0+ + if hasattr(all_inst[0], "meta_labels"): + meta_kwargs = {"labels": all_inst[0].meta_labels} + kp_inst = pysat.Instrument(labels=all_inst[0].meta_labels) + else: + meta_kwargs = all_inst[0].meta_kwargs + kp_inst = pysat.Instrument(meta_kwargs=meta_kwargs) + kp_inst.inst_module = pysat_sw.instruments.sw_kp kp_inst.tag = tag kp_inst.date = start kp_inst.doy = np.int64(start.strftime("%j")) + kp_inst.meta = pysat.Meta(**meta_kwargs) initialize_kp_metadata(kp_inst.meta, 'Kp', fill_val=fill_val) kp_times = list() diff --git a/pysatSpaceWeather/instruments/methods/lasp.py b/pysatSpaceWeather/instruments/methods/lasp.py index c8688d4..a3ddfaf 100644 --- a/pysatSpaceWeather/instruments/methods/lasp.py +++ b/pysatSpaceWeather/instruments/methods/lasp.py @@ -1,4 +1,12 @@ +#!/usr/bin/env python # -*- coding: utf-8 -*-. +# Full license can be found in License.md +# Full author list can be found in .zenodo.json file +# DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. +# ---------------------------------------------------------------------------- """Provides support routines for LASP data.""" import datetime as dt diff --git a/pysatSpaceWeather/instruments/methods/lisird.py b/pysatSpaceWeather/instruments/methods/lisird.py index 9e44491..5832749 100644 --- a/pysatSpaceWeather/instruments/methods/lisird.py +++ b/pysatSpaceWeather/instruments/methods/lisird.py @@ -3,6 +3,9 @@ # Full license can be found in License.md # Full author list can be found in .zenodo.json file # DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. # ---------------------------------------------------------------------------- """Provides support functions for the LASP LISIRD data base.""" diff --git a/pysatSpaceWeather/instruments/methods/swpc.py b/pysatSpaceWeather/instruments/methods/swpc.py index f6c5856..0635a59 100644 --- a/pysatSpaceWeather/instruments/methods/swpc.py +++ b/pysatSpaceWeather/instruments/methods/swpc.py @@ -3,6 +3,9 @@ # Full license can be found in License.md # Full author list can be found in .zenodo.json file # DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. # ---------------------------------------------------------------------------- """Provides routines that support SWPC space weather instruments.""" @@ -37,7 +40,7 @@ def daily_dsd_download(name, today, data_path, mock_download_dir=None): name : str Instrument name, expects one of 'f107', 'flare', 'ssn', or 'sbfield'. today : dt.datetime - Datetime for current day + Datetime for current day. data_path : str Path to data directory. mock_download_dir : str or NoneType @@ -580,7 +583,7 @@ def geomag_forecast_download(name, date_array, data_path, Raises ------ IOError - If an unknown mock download directory is supplied or the desored file + If an unknown mock download directory is supplied or the desired file is missing. Note @@ -954,7 +957,7 @@ def list_files(name, tag, inst_id, data_path, format_str=None): # Pad list of files data to include most recent file under tomorrow if not files.empty: - pds_offset = pds.DateOffset(days=1) + pds_offset = dt.timedelta(days=1) files.loc[files.index[-1] + pds_offset] = files.values[-1] files.loc[files.index[-1] + pds_offset] = files.values[-1] diff --git a/pysatSpaceWeather/instruments/sw_ae.py b/pysatSpaceWeather/instruments/sw_ae.py index aa90727..73d2db4 100644 --- a/pysatSpaceWeather/instruments/sw_ae.py +++ b/pysatSpaceWeather/instruments/sw_ae.py @@ -1,4 +1,12 @@ -# -*- coding: utf-8 -*- +#!/usr/bin/env python +# -*- coding: utf-8 -*-. +# Full license can be found in License.md +# Full author list can be found in .zenodo.json file +# DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. +# ---------------------------------------------------------------------------- """Supports the auroral electrojet AE values. Properties diff --git a/pysatSpaceWeather/instruments/sw_al.py b/pysatSpaceWeather/instruments/sw_al.py index 012614a..72f07ed 100644 --- a/pysatSpaceWeather/instruments/sw_al.py +++ b/pysatSpaceWeather/instruments/sw_al.py @@ -1,4 +1,12 @@ -# -*- coding: utf-8 -*- +#!/usr/bin/env python +# -*- coding: utf-8 -*-. +# Full license can be found in License.md +# Full author list can be found in .zenodo.json file +# DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. +# ---------------------------------------------------------------------------- """Supports the auroral electrojet AL values. Properties diff --git a/pysatSpaceWeather/instruments/sw_ap.py b/pysatSpaceWeather/instruments/sw_ap.py index 620a3aa..cc20853 100644 --- a/pysatSpaceWeather/instruments/sw_ap.py +++ b/pysatSpaceWeather/instruments/sw_ap.py @@ -1,4 +1,12 @@ -# -*- coding: utf-8 -*- +#!/usr/bin/env python +# -*- coding: utf-8 -*-. +# Full license can be found in License.md +# Full author list can be found in .zenodo.json file +# DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. +# ---------------------------------------------------------------------------- """Supports ap index values. Properties @@ -94,7 +102,7 @@ 'forecast': tomorrow, 'prediction': tomorrow, 'recent': today, - '45day': tomorrow}} + '45day': today}} # ---------------------------------------------------------------------------- # Instrument methods diff --git a/pysatSpaceWeather/instruments/sw_apo.py b/pysatSpaceWeather/instruments/sw_apo.py index c2a1a25..be5f139 100644 --- a/pysatSpaceWeather/instruments/sw_apo.py +++ b/pysatSpaceWeather/instruments/sw_apo.py @@ -1,4 +1,12 @@ -# -*- coding: utf-8 -*- +#!/usr/bin/env python +# -*- coding: utf-8 -*-. +# Full license can be found in License.md +# Full author list can be found in .zenodo.json file +# DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. +# ---------------------------------------------------------------------------- """Supports apo index values. Properties diff --git a/pysatSpaceWeather/instruments/sw_au.py b/pysatSpaceWeather/instruments/sw_au.py index e759c17..4c49085 100644 --- a/pysatSpaceWeather/instruments/sw_au.py +++ b/pysatSpaceWeather/instruments/sw_au.py @@ -1,4 +1,12 @@ -# -*- coding: utf-8 -*- +#!/usr/bin/env python +# -*- coding: utf-8 -*-. +# Full license can be found in License.md +# Full author list can be found in .zenodo.json file +# DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. +# ---------------------------------------------------------------------------- """Supports the auroral electrojet AU values. Properties diff --git a/pysatSpaceWeather/instruments/sw_cp.py b/pysatSpaceWeather/instruments/sw_cp.py index 1bd629b..009e9f0 100644 --- a/pysatSpaceWeather/instruments/sw_cp.py +++ b/pysatSpaceWeather/instruments/sw_cp.py @@ -1,4 +1,12 @@ -# -*- coding: utf-8 -*- +#!/usr/bin/env python +# -*- coding: utf-8 -*-. +# Full license can be found in License.md +# Full author list can be found in .zenodo.json file +# DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. +# ---------------------------------------------------------------------------- """Supports Cp index values. Properties @@ -92,9 +100,9 @@ def load(fnames, tag='', inst_id=''): Parameters ---------- fnames : pandas.Series - Series of filenames + Series of filenames. tag : str - Instrument tag (default='') + Instrument tag. (default='') inst_id : str Instrument ID, not used. (default='') diff --git a/pysatSpaceWeather/instruments/sw_dst.py b/pysatSpaceWeather/instruments/sw_dst.py index ed64a66..6d6fc40 100644 --- a/pysatSpaceWeather/instruments/sw_dst.py +++ b/pysatSpaceWeather/instruments/sw_dst.py @@ -1,4 +1,12 @@ -# -*- coding: utf-8 -*- +#!/usr/bin/env python +# -*- coding: utf-8 -*-. +# Full license can be found in License.md +# Full author list can be found in .zenodo.json file +# DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. +# ---------------------------------------------------------------------------- """Supports Dst values. Downloads data from NGDC. Properties @@ -17,13 +25,6 @@ ---- Will only work until 2057. -This material is based upon work supported by the -National Science Foundation under Grant Number 1259508. - -Any opinions, findings, and conclusions or recommendations expressed in this -material are those of the author(s) and do not necessarily reflect the views -of the National Science Foundation. - """ import datetime as dt @@ -254,11 +255,11 @@ def download(date_array, tag, inst_id, data_path, mock_download_dir=None): data_path : str Path to data directory. If not None, will process any files with the correct name and date - as if they were downloaded + as if they were downloaded. mock_download_dir : str or NoneType Local directory with downloaded files or None. If not None, will process any files with the correct name and date as if they were - downloaded (default=None) + downloaded. (default=None) Raises ------ diff --git a/pysatSpaceWeather/instruments/sw_f107.py b/pysatSpaceWeather/instruments/sw_f107.py index ffd5413..d3ca6b5 100644 --- a/pysatSpaceWeather/instruments/sw_f107.py +++ b/pysatSpaceWeather/instruments/sw_f107.py @@ -3,6 +3,9 @@ # Full license can be found in License.md # Full author list can be found in .zenodo.json file # DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. # ---------------------------------------------------------------------------- """Supports F10.7 index values. @@ -69,7 +72,6 @@ import numpy as np import os import pandas as pds -import warnings import pysat @@ -107,7 +109,7 @@ 'prelim': dt.datetime(2009, 1, 1), 'daily': today, 'forecast': tomorrow, - '45day': tomorrow}, + '45day': today}, 'obs': {'now': dt.datetime(2009, 1, 1)}, 'adj': {'now': dt.datetime(2009, 1, 1)}} @@ -132,26 +134,6 @@ def init(self): if self.tag == 'historic': self.lasp_stime = lasp_stime - # Raise Deprecation warnings - if self.tag in ['daily', 'prelim']: - # This tag loads more than just F10.7 data, and the behaviour will be - # deprecated in v0.1.0 - warnings.warn("".join(["Upcoming structural changes will prevent ", - "Instruments from loading multiple data sets in", - " one Instrument. In version 0.1.0+ the SSN, ", - "solar flare, and solar mean field data will be", - " accessable from the `sw_ssn`, `sw_flare`, ", - "and `sw_sbfield` Instruments."]), - DeprecationWarning, stacklevel=2) - elif self.tag == '45day': - # This tag loads more than just F10.7 data, and the behaviour will be - # deprecated in v0.1.0 - warnings.warn("".join(["Upcoming structural changes will prevent ", - "Instruments from loading multiple data sets in", - " one Instrument. In version 0.1.0+ the Ap will", - " be accessable from the `sw_ap` Instrument."]), - DeprecationWarning, stacklevel=2) - return diff --git a/pysatSpaceWeather/instruments/sw_flare.py b/pysatSpaceWeather/instruments/sw_flare.py index e510811..54bd147 100644 --- a/pysatSpaceWeather/instruments/sw_flare.py +++ b/pysatSpaceWeather/instruments/sw_flare.py @@ -1,4 +1,12 @@ -# -*- coding: utf-8 -*- +#!/usr/bin/env python +# -*- coding: utf-8 -*-. +# Full license can be found in License.md +# Full author list can be found in .zenodo.json file +# DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. +# ---------------------------------------------------------------------------- """Supports solar flare values. Properties diff --git a/pysatSpaceWeather/instruments/sw_hpo.py b/pysatSpaceWeather/instruments/sw_hpo.py index d0c822b..9db5a1c 100644 --- a/pysatSpaceWeather/instruments/sw_hpo.py +++ b/pysatSpaceWeather/instruments/sw_hpo.py @@ -1,4 +1,12 @@ -# -*- coding: utf-8 -*- +#!/usr/bin/env python +# -*- coding: utf-8 -*-. +# Full license can be found in License.md +# Full author list can be found in .zenodo.json file +# DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. +# ---------------------------------------------------------------------------- """Supports Hpo index values. Properties @@ -82,9 +90,9 @@ def load(fnames, tag='', inst_id=''): Parameters ---------- fnames : pandas.Series - Series of filenames + Series of filenames. tag : str - Instrument tag (default='') + Instrument tag. (default='') inst_id : str Instrument ID, not used. (default='') diff --git a/pysatSpaceWeather/instruments/sw_kp.py b/pysatSpaceWeather/instruments/sw_kp.py index 13b6a13..030b93b 100644 --- a/pysatSpaceWeather/instruments/sw_kp.py +++ b/pysatSpaceWeather/instruments/sw_kp.py @@ -1,4 +1,12 @@ -# -*- coding: utf-8 -*- +#!/usr/bin/env python +# -*- coding: utf-8 -*-. +# Full license can be found in License.md +# Full author list can be found in .zenodo.json file +# DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. +# ---------------------------------------------------------------------------- """Supports Kp index values. Properties @@ -56,13 +64,6 @@ feature, and multi_file_day feature available from the pyast.Instrument object is not appropriate for these tags data. -This material is based upon work supported by the -National Science Foundation under Grant Number 1259508. - -Any opinions, findings, and conclusions or recommendations expressed in this -material are those of the author(s) and do not necessarily reflect the views -of the National Science Foundation. - """ import datetime as dt @@ -117,16 +118,6 @@ def init(self): self.references = methods.kp_ap.references(self.name, self.tag) pysat.logger.info(self.acknowledgements) - if self.tag in ["def", "now"]: - # This tag loads more than just Kp data, and the behaviour will be - # deprecated in v0.1.0 - warnings.warn("".join(["Upcoming structural changes will prevent ", - "Instruments from loading multiple data sets ", - "in one Instrument. In version 0.1.0+ the Ap ", - "and Cp data will be accessable from the ", - "`sw_ap` and `sw_cp` Instruments."]), - DeprecationWarning, stacklevel=2) - return diff --git a/pysatSpaceWeather/instruments/sw_mgii.py b/pysatSpaceWeather/instruments/sw_mgii.py index 9379c9b..c624a19 100644 --- a/pysatSpaceWeather/instruments/sw_mgii.py +++ b/pysatSpaceWeather/instruments/sw_mgii.py @@ -3,6 +3,9 @@ # Full license can be found in License.md # Full author list can be found in .zenodo.json file # DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. # ---------------------------------------------------------------------------- """Supports the MgII core-to-wing ratio index. @@ -271,7 +274,7 @@ def download(date_array, tag, inst_id, data_path, mock_download_dir=None): mock_download_dir : str or NoneType Local directory with downloaded files or None. If not None, will process any files with the correct name and date as if they were - downloaded (default=None) + downloaded. (default=None) Raises ------ diff --git a/pysatSpaceWeather/instruments/sw_polarcap.py b/pysatSpaceWeather/instruments/sw_polarcap.py index 0db8f0f..9a85df0 100644 --- a/pysatSpaceWeather/instruments/sw_polarcap.py +++ b/pysatSpaceWeather/instruments/sw_polarcap.py @@ -1,4 +1,12 @@ -# -*- coding: utf-8 -*- +#!/usr/bin/env python +# -*- coding: utf-8 -*-. +# Full license can be found in License.md +# Full author list can be found in .zenodo.json file +# DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. +# ---------------------------------------------------------------------------- """Supports polar cap indexes. Properties @@ -168,7 +176,7 @@ def download(date_array, tag, inst_id, data_path, mock_download_dir=None): mock_download_dir : str or NoneType Local directory with downloaded files or None. If not None, will process any files with the correct name and date as if they were - downloaded (default=None) + downloaded. (default=None) Raises ------ diff --git a/pysatSpaceWeather/instruments/sw_sbfield.py b/pysatSpaceWeather/instruments/sw_sbfield.py index 04a89c3..f4207f4 100644 --- a/pysatSpaceWeather/instruments/sw_sbfield.py +++ b/pysatSpaceWeather/instruments/sw_sbfield.py @@ -1,4 +1,12 @@ -# -*- coding: utf-8 -*- +#!/usr/bin/env python +# -*- coding: utf-8 -*-. +# Full license can be found in License.md +# Full author list can be found in .zenodo.json file +# DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. +# ---------------------------------------------------------------------------- """Supports solar magnetic field values. Properties @@ -243,7 +251,7 @@ def download(date_array, tag, inst_id, data_path, update_files=False, mock_download_dir : str or NoneType Local directory with downloaded files or None. If not None, will process any files with the correct name and date as if they were - downloaded (default=None) + downloaded. (default=None) Raises ------ diff --git a/pysatSpaceWeather/instruments/sw_ssn.py b/pysatSpaceWeather/instruments/sw_ssn.py index 6ecfd37..77eafba 100644 --- a/pysatSpaceWeather/instruments/sw_ssn.py +++ b/pysatSpaceWeather/instruments/sw_ssn.py @@ -1,4 +1,12 @@ -# -*- coding: utf-8 -*- +#!/usr/bin/env python +# -*- coding: utf-8 -*-. +# Full license can be found in License.md +# Full author list can be found in .zenodo.json file +# DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. +# ---------------------------------------------------------------------------- """Supports Sunspot Number (SSN) and related indices. Properties @@ -275,11 +283,11 @@ def download(date_array, tag, inst_id, data_path, update_files=False, data_path : str Path to data directory. update_files : bool - Re-download data for files that already exist if True (default=False) + Re-download data for files that already exist if True. (default=False) mock_download_dir : str or NoneType Local directory with downloaded files or None. If not None, will process any files with the correct name and date as if they were - downloaded (default=None) + downloaded. (default=None) Raises ------ diff --git a/pysatSpaceWeather/instruments/sw_stormprob.py b/pysatSpaceWeather/instruments/sw_stormprob.py index 0fef92c..1dea807 100644 --- a/pysatSpaceWeather/instruments/sw_stormprob.py +++ b/pysatSpaceWeather/instruments/sw_stormprob.py @@ -1,4 +1,12 @@ -# -*- coding: utf-8 -*- +#!/usr/bin/env python +# -*- coding: utf-8 -*-. +# Full license can be found in License.md +# Full author list can be found in .zenodo.json file +# DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. +# ---------------------------------------------------------------------------- """Supports storm probabilities. Properties @@ -169,7 +177,7 @@ def download(date_array, tag, inst_id, data_path, mock_download_dir=None): mock_download_dir : str or NoneType Local directory with downloaded files or None. If not None, will process any files with the correct name and date as if they were - downloaded (default=None) + downloaded. (default=None) Raises ------ diff --git a/pysatSpaceWeather/tests/test_instruments.py b/pysatSpaceWeather/tests/test_instruments.py index 9f4f950..ac685c4 100644 --- a/pysatSpaceWeather/tests/test_instruments.py +++ b/pysatSpaceWeather/tests/test_instruments.py @@ -1,3 +1,12 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*-. +# Full license can be found in License.md +# Full author list can be found in .zenodo.json file +# DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. +# ---------------------------------------------------------------------------- """Unit and Integration Tests for each instrument module. Note @@ -48,11 +57,7 @@ def setup_method(self): warnings.simplefilter("always", DeprecationWarning) self.in_kwargs = [ - {"inst_module": pysatSpaceWeather.instruments.sw_kp, 'tag': ''}, - {"inst_module": pysatSpaceWeather.instruments.sw_kp}, - {"inst_module": pysatSpaceWeather.instruments.sw_f107, - 'tag': '45day'}, - {"inst_module": pysatSpaceWeather.instruments.sw_f107}] + {"inst_module": pysatSpaceWeather.instruments.sw_kp, 'tag': ''}] self.ref_time = dt.datetime(2001, 1, 1) self.warn_msgs = [] self.war = "" @@ -89,71 +94,6 @@ def test_sw_kp_default_tag_deprecation(self): self.eval_warnings() return - @pytest.mark.parametrize("tag", ["def", "now"]) - def test_sw_kp_gfz_extra_data_deprecation(self, tag): - """Test the deprecation for loading extra data for the GFZ sw_kp data. - - Parameters - ---------- - tag : str - Instrument tag - - """ - - with warnings.catch_warnings(record=True) as self.war: - pysat.Instrument(tag=tag, **self.in_kwargs[1]) - - self.warn_msgs = [ - "".join(["Upcoming structural changes will prevent Instruments ", - "from loading multiple data sets in one Instrument. In ", - "version 0.1.0+ the Ap and Cp data will be accessable ", - "from the `sw_ap` and `sw_cp` Instruments."])] - - # Evaluate the warning output - self.eval_warnings() - return - - def test_sw_f107_45day_extra_data_deprecation(self): - """Test the deprecation for loading extra data by 45day sw_f107.""" - - with warnings.catch_warnings(record=True) as self.war: - pysat.Instrument(**self.in_kwargs[2]) - - self.warn_msgs = ["".join(["Upcoming structural changes will prevent ", - "Instruments from loading multiple data ", - "sets in one Instrument. In version 0.1.0+", - " the Ap will be accessable from the ", - "`sw_ap` Instrument."])] - - # Evaluate the warning output - self.eval_warnings() - return - - @pytest.mark.parametrize("tag", ["daily", "prelim"]) - def test_sw_f107_extra_data_deprecation(self, tag): - """Test the deprecation for loading extra data using SWPC sw_f107 data. - - Parameters - ---------- - tag : str - Instrument tag - - """ - - with warnings.catch_warnings(record=True) as self.war: - pysat.Instrument(tag=tag, **self.in_kwargs[3]) - - self.warn_msgs = [ - "".join(["Upcoming structural changes will prevent Instruments ", - "from loading multiple data sets in one Instrument. In ", - "version 0.1.0+ the SSN, solar flare, and solar mean ", - "field data will be accessable from the `sw_ssn`, ", - "`sw_flare`, and `sw_sbfield` Instruments."])] - - # Evaluate the warning output - self.eval_warnings() - return - class TestSWInstrumentLogging(object): """Test logging messages raised under instrument-specific conditions.""" diff --git a/pysatSpaceWeather/tests/test_methods_ace.py b/pysatSpaceWeather/tests/test_methods_ace.py index b84b7bd..41be517 100644 --- a/pysatSpaceWeather/tests/test_methods_ace.py +++ b/pysatSpaceWeather/tests/test_methods_ace.py @@ -2,6 +2,9 @@ # Full license can be found in License.md # Full author list can be found in .zenodo.json file # DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. # ---------------------------------------------------------------------------- """Integration and unit test suite for ACE methods.""" diff --git a/pysatSpaceWeather/tests/test_methods_ae.py b/pysatSpaceWeather/tests/test_methods_ae.py index 6ce6884..705330e 100644 --- a/pysatSpaceWeather/tests/test_methods_ae.py +++ b/pysatSpaceWeather/tests/test_methods_ae.py @@ -2,6 +2,9 @@ # Full license can be found in License.md # Full author list can be found in .zenodo.json file # DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. # ---------------------------------------------------------------------------- """Integration and unit test suite for AE methods.""" diff --git a/pysatSpaceWeather/tests/test_methods_f107.py b/pysatSpaceWeather/tests/test_methods_f107.py index 70c9845..30bc16e 100644 --- a/pysatSpaceWeather/tests/test_methods_f107.py +++ b/pysatSpaceWeather/tests/test_methods_f107.py @@ -2,6 +2,9 @@ # Full license can be found in License.md # Full author list can be found in .zenodo.json file # DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. # ---------------------------------------------------------------------------- """Test suite for F10.7 methods.""" diff --git a/pysatSpaceWeather/tests/test_methods_general.py b/pysatSpaceWeather/tests/test_methods_general.py index 031ec5c..bc7db98 100644 --- a/pysatSpaceWeather/tests/test_methods_general.py +++ b/pysatSpaceWeather/tests/test_methods_general.py @@ -2,6 +2,9 @@ # Full license can be found in License.md # Full author list can be found in .zenodo.json file # DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. # ---------------------------------------------------------------------------- """Integration and unit test suite for ACE methods.""" diff --git a/pysatSpaceWeather/tests/test_methods_gfz.py b/pysatSpaceWeather/tests/test_methods_gfz.py index 87436aa..c395433 100644 --- a/pysatSpaceWeather/tests/test_methods_gfz.py +++ b/pysatSpaceWeather/tests/test_methods_gfz.py @@ -2,6 +2,9 @@ # Full license can be found in License.md # Full author list can be found in .zenodo.json file # DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. # ---------------------------------------------------------------------------- """Integration and unit test suite for ACE methods.""" diff --git a/pysatSpaceWeather/tests/test_methods_kp.py b/pysatSpaceWeather/tests/test_methods_kp.py index 88b4b9a..9f10e3c 100644 --- a/pysatSpaceWeather/tests/test_methods_kp.py +++ b/pysatSpaceWeather/tests/test_methods_kp.py @@ -2,6 +2,9 @@ # Full license can be found in License.md # Full author list can be found in .zenodo.json file # DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. # ---------------------------------------------------------------------------- """Test suite for Kp and Ap methods.""" diff --git a/pysatSpaceWeather/tests/test_methods_lisird.py b/pysatSpaceWeather/tests/test_methods_lisird.py index 7ea3618..75a2c39 100644 --- a/pysatSpaceWeather/tests/test_methods_lisird.py +++ b/pysatSpaceWeather/tests/test_methods_lisird.py @@ -3,6 +3,9 @@ # Full license can be found in License.md # Full author list can be found in .zenodo.json file # DOI:10.5281/zenodo.3986138 +# +# DISTRIBUTION STATEMENT A: Approved for public release. Distribution is +# unlimited. # ---------------------------------------------------------------------------- """Tests for the LISIRD functions.""" diff --git a/setup.cfg b/setup.cfg index a0a8a7c..3d5d145 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = pysatSpaceWeather -version = 0.0.10 +version = 0.1.0 url = https://github.com/pysat/pysatSpaceWeather [flake8] diff --git a/test_requirements.txt b/test_requirements.txt index b8a4185..3bfdc26 100644 --- a/test_requirements.txt +++ b/test_requirements.txt @@ -7,4 +7,4 @@ numpydoc pytest-cov pytest-ordering sphinx -sphinx_rtd_theme +sphinx_rtd_theme>=1.2.2,<2.0.0