Skip to content

Commit

Permalink
Merge remote-tracking branch 'noaa/develop' into openaq
Browse files Browse the repository at this point in the history
  • Loading branch information
zmoon committed Sep 11, 2024
2 parents f855877 + b45c1fa commit 7dfe2e2
Show file tree
Hide file tree
Showing 49 changed files with 3,358 additions and 159 deletions.
2 changes: 2 additions & 0 deletions .codespell-exclude
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,5 @@
df = aeronet.add_data(dates, inv_type="ALM15", product="SIZ")
df = aeronet.add_data(dates, inv_type="HYB15", product="SIZ")
# https://aeronet.gsfc.nasa.gov/cgi-bin/print_web_data_inv_v3?site=Cart_Site&year=2002&month=6&day=1&year2=2003&month2=6&day2=14&product=SIZ&AVG=20&ALM15=1&if_no_html=1
"RIN", "Refractive indices (real and imaginary)"
"RIN",
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
attrs=22.2.0
- name: Test with pytest
run: pytest -n auto -v
run: pytest -n auto -v -W "ignore:Downloading test file:UserWarning::"

- name: Test with pytspack installed
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
if: github.repository == 'noaa-oar-arl/monetio'
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: "3.9"
- uses: pre-commit/[email protected].0
- uses: pre-commit/[email protected].1

cff:
name: Validate CITATION.cff
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
._.DS_Store

docs/api/

tests/data/MOP*.he5
tests/data/TROPOMI*.nc
tests/data/OMPS-*.h5

# Default GitHub .gitignore for Python below:

Expand Down
1 change: 1 addition & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
# The name of the Pygments (syntax highlighting) style to use.
pygments_style = "sphinx"

linkcheck_retries = 3 # default is 1
linkcheck_ignore = [
"https://doi.org/10.1080/10473289.2005.10464718",
"https://www.camx.com",
Expand Down
2 changes: 1 addition & 1 deletion docs/installing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,5 @@ or you can manually download it from GitHub and install it using the setup.py::
always be available to python 2.7 users. For more information see the
following references:

- `Python 3 Statement <https://python3statement.org/>`__
- `Python 3 Statement <https://python3statement.github.io/>`__
- `Tips on porting to Python 3 <https://docs.python.org/3/howto/pyporting.html>`__
7 changes: 6 additions & 1 deletion environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,21 @@ dependencies:
- xarray
#
# optional
- h5netcdf
- h5py
- joblib
- lxml
- pyhdf <0.11
- pyhdf!=0.11.3
- pyresample
- requests
- timezonefinder
#
# test
- filelock
- pytest
- pytest-xdist
#
- pip>=21.1
- pip:
- "-e ."
- pytest-print
6 changes: 4 additions & 2 deletions monetio/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
openaq_v2,
pams,
)
from .profile import geoms, icartt, tolnet
from .profile import geoms, gml_ozonesonde, icartt, tolnet
from .sat import goes

__version__ = "0.2.4"
__version__ = "0.2.6"

__all__ = [
"__version__",
Expand Down Expand Up @@ -47,6 +47,7 @@
#
# profile obs
"geoms",
"gml_ozonesonde",
"icartt",
"tolnet",
#
Expand All @@ -59,6 +60,7 @@
"fv3chem",
"hysplit",
"hytraj",
"icap_mme",
"ncep_grib",
"pardump",
"prepchem",
Expand Down
6 changes: 5 additions & 1 deletion monetio/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from . import (
_camx_mm,
_cesm_fv_mm,
_cesm_se_mm,
_cmaq_mm,
Expand All @@ -9,13 +10,15 @@
fv3chem,
hysplit,
hytraj,
icap_mme,
ncep_grib,
pardump,
prepchem,
raqms,
)

__all__ = [
"_camx_mm",
"_cesm_se_mm",
"_cesm_fv_mm",
"_cmaq_mm",
Expand All @@ -26,9 +29,10 @@
"fv3chem",
"hysplit",
"hytraj",
"icap_mme",
"ncep_grib",
"prepchem",
"pardump",
"prepchem",
"raqms",
]

Expand Down
Loading

0 comments on commit 7dfe2e2

Please sign in to comment.