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

fixed the __eq__ check,and acouple bugs about out of bounds. #83

Open
wants to merge 36 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
018b85e
fixed the __eq__ check,and acouple bugs about out of bounds.
ChrisBarker-NOAA Nov 29, 2023
e311ada
updated the requirements files a bit
ChrisBarker-NOAA Nov 29, 2023
daf35a1
fixed the __eq__ check,and acouple bugs about out of bounds.
ChrisBarker-NOAA Nov 29, 2023
f9bccea
fvcom depth added
jay-hennen Dec 5, 2023
a6ef560
Merge branch 'master' into fvcom
jay-hennen Dec 5, 2023
7c69c58
added __eq__ to SGRid and UGRid -- they are used in tests.
ChrisBarker-NOAA Dec 5, 2023
d1fcd63
Merge branch 'update_time' of https://github.com/NOAA-ORR-ERD/gridded…
ChrisBarker-NOAA Dec 5, 2023
173f1af
a bunch of linting
ChrisBarker-NOAA Dec 5, 2023
06e95af
a bit more info ion the docs main page
ChrisBarker-NOAA Dec 8, 2023
4a543db
removed an extraneous print
ChrisBarker-NOAA Dec 12, 2023
bcdec04
further fvcom depth development
jay-hennen Dec 15, 2023
c053e00
utilities to handle datasets and ncvar searching
jay-hennen Jan 5, 2024
887fab1
improvements to ugrid interpolation for multidim data
jay-hennen Jan 5, 2024
2be0176
variance in depth added
jay-hennen Jan 5, 2024
a717b9b
test for transect generation added
jay-hennen Jan 5, 2024
67319bb
Depth factory class overhauled
jay-hennen Jan 5, 2024
1839b33
redundant ROMS_Depth from_netCDF
jay-hennen Jan 5, 2024
542af00
improved ugrid creation
jay-hennen Jan 10, 2024
243370a
renamed fixtures
jay-hennen Jan 10, 2024
535e580
version to 0.6.0
jay-hennen Jan 12, 2024
87a57ad
Merge branch 'fvcom'
jay-hennen Jan 12, 2024
b4e98c6
Merge branch 'master' of https://github.com/NOAA-ORR-ERD/gridded
ChrisBarker-NOAA Jan 12, 2024
f3ba833
removed linting from tests
ChrisBarker-NOAA Jan 12, 2024
dbccd1d
fixed issue with regrid utility function
jay-hennen Jan 12, 2024
fba6285
Merge branch 'master' of https://github.com/NOAA-ORR-ERD/gridded
jay-hennen Jan 12, 2024
c875860
incorrect use of issubclass
jay-hennen Jan 12, 2024
9e86bc3
reworked regrid utility function to use get_transect
jay-hennen Jan 17, 2024
7e82b05
added depth test file
jay-hennen Jan 18, 2024
d586534
updated version
jay-hennen Jan 18, 2024
9a1dad6
fix for incorrect boolean statement
jay-hennen Jan 24, 2024
161996a
fixed the __eq__ check,and acouple bugs about out of bounds.
ChrisBarker-NOAA Nov 29, 2023
1ec5afe
added __eq__ to SGRid and UGRid -- they are used in tests.
ChrisBarker-NOAA Dec 5, 2023
f74f33f
a bunch of linting
ChrisBarker-NOAA Dec 5, 2023
b17e79c
added an Exception for Out of Time Bounds
ChrisBarker-NOAA Jan 24, 2024
3dc487e
added TimeSeriesError and OutOfTimeRangeError
ChrisBarker-NOAA Jan 25, 2024
cc7ab84
Merge branch 'update_time' of https://github.com/NOAA-ORR-ERD/gridded…
ChrisBarker-NOAA Oct 31, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions .github/workflows/conda_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,21 @@ jobs:
cd ..
pytest --pyargs gridded

lint:
name: Flake8 linting
runs-on: "ubuntu-latest"
steps:
- uses: actions/checkout@v2
- uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: lint
python-version: 3.9
auto-activate-base: false
- shell: bash -l {0}
run: |
conda config --add channels conda-forge
- name: Lint
shell: bash -l {0}
run: |
conda install flake8
python -m flake8 --statistics gridded/
# lint:
# name: Flake8 linting
# runs-on: "ubuntu-latest"
# steps:
# - uses: actions/checkout@v2
# - uses: conda-incubator/setup-miniconda@v2
# with:
# activate-environment: lint
# python-version: 3.9
# auto-activate-base: false
# - shell: bash -l {0}
# run: |
# conda config --add channels conda-forge
# - name: Lint
# shell: bash -l {0}
# run: |
# conda install flake8
# python -m flake8 --statistics gridded/
8 changes: 4 additions & 4 deletions conda_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

# requires python, but if you leave it out, it will use python already in
# the conda environment, rather than upgrading or downgrading
# python>=3.9.*
numpy>=1.15.*
python>=3.9
numpy>=1.15
scipy
netcdf4>=1.4.*
cell_tree2d>=0.3.*
netcdf4>=1.4
cell_tree2d>=0.3
2 changes: 1 addition & 1 deletion conda_requirements_test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# conda install --file conda_requirements.txt --file conda_requirements_test.txt


# this is the minimal that will support travis tests
# this is the minimal that will support CI tests
pytest
pytest-cov
progressbar
Expand Down
12 changes: 11 additions & 1 deletion docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,17 @@ Welcome to ``gridded``'s documentation!
:align: center


``gridded`` is a single API for accessing / working with gridded model results on multiple grid types
``gridded`` is a single Python API for accessing / working with gridded model results on multiple grid types.

The source code for ``gridded`` can be found on gitHub at:

https://github.com/NOAA-ORR-ERD/gridded

It is also available as a conda package on conda-forge:

``conda install -c conda-forge gridded``

It is not currently available on PyPi, due to complex compiled dependences -- help accepted.


Contents
Expand Down
13 changes: 9 additions & 4 deletions gridded/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python

__version__ = "0.5.9"
__version__ = "0.6.3"

VALID_SGRID_LOCATIONS = (None, 'center', 'edge1', 'edge2', 'node')
VALID_UGRID_LOCATIONS = (None, 'node', 'face', 'edge', 'boundary')
Expand All @@ -11,10 +11,13 @@
from .variable import Variable, VectorVariable
from .time import Time

from .depth import DepthBase
from .depth import DepthBase, L_Depth, S_Depth
DepthBase._default_component_types['variable'] = Variable
S_Depth._default_component_types['variable'] = Variable
S_Depth._default_component_types['bathymetry'] = Variable
S_Depth._default_component_types['zeta'] = Variable


from .time import OutOfTimeRangeError

__all__ = ["Variable",
"VectorVariable",
Expand All @@ -23,5 +26,7 @@
"Grid_S",
"Grid_U",
"Dataset",
"Time"]
"Time",
"OutOfTimeRangeError",
]

Loading
Loading