Skip to content

Commit

Permalink
Merge pull request #166 from noaa-ocs-modeling/pyproject_fix
Browse files Browse the repository at this point in the history 
Use StormEvents v2
  • Loading branch information
@SorooshMani-NOAA
SorooshMani-NOAA authored Mar 27, 2023
2 parents 811b1b9 + 153f0fd commit fd002a8
Show file tree
Hide file tree
Showing 8 changed files with 78 additions and 74 deletions.
1 change: 1 addition & 0 deletions .github/workflows/quick_test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ jobs:
key: test-${{ runner.os }}-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}
- name: install dependencies
run: |
sudo apt update
sudo apt install libhdf5-dev
sudo apt install libnetcdf-dev
pip install ".[testing]"
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest, macos-latest ]
python-version: [ '3.7', '3.8', '3.9', '3.x' ]
python-version: [ '3.8', '3.9', '3.x' ]
exclude:
- os: macos-latest
python-version: '3.x'
Expand All @@ -63,6 +63,7 @@ jobs:
key: test-${{ runner.os }}-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}
- name: install linux dependencies
run: |
sudo apt update
sudo apt install libhdf5-dev
sudo apt install libnetcdf-dev
if: runner.os == 'Linux'
Expand Down Expand Up @@ -92,6 +93,7 @@ jobs:
key: test-${{ runner.os }}-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}
- name: install linux dependencies
run: |
sudo apt update
sudo apt install libhdf5-dev
sudo apt install libnetcdf-dev
if: runner.os == 'Linux'
Expand Down
2 changes: 1 addition & 1 deletion adcircpy/cmd/plot_fort61.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import matplotlib.pyplot as plt
import pandas
from stormevents.coops import COOPS_Station
from searvey.coops import COOPS_Station

from adcircpy.outputs import Fort61

Expand Down
2 changes: 1 addition & 1 deletion adcircpy/fort15.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from shapely import ops
from shapely.geometry import MultiPolygon, Polygon
from shapely.geometry.base import BaseGeometry
from stormevents.coops import coops_stations, coops_stations_within_region
from searvey.coops import coops_stations, coops_stations_within_region
from stormevents.nhc import VortexTrack
import typepigeon

Expand Down
5 changes: 3 additions & 2 deletions pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ build-backend = 'poetry.core.masonry.api'
enable = true

[tool.poetry.dependencies]
python = '^3.6'
python = '^3.8'
appdirs = '*'
geopandas = '<0.11'
haversine = '*'
Expand All @@ -33,8 +33,9 @@ psutil = '*'
pyproj = '>=2.6'
requests = '*'
scipy = '*'
searvey = '*'
shapely = '*'
stormevents = '^1.4.0'
stormevents = '>=2'
typepigeon = '<2' # newer versions require code update
utm = '*'
isort = { version = '*', optional = true }
Expand Down
104 changes: 52 additions & 52 deletions tests/data/reference/test_Stations/stations_1.fort.15
View file
Original file line number Diff line number Diff line change
@@ -1,56 +1,56 @@
13 ! NSTAE
-75.75 36.1875 ! 8651370
-75.5625 35.78125 ! 8652587
-75.6875 35.21875 ! 8654467
-76.6875 34.71875 ! 8656483
-77.9375 34.21875 ! 8658120
-77.8125 34.21875 ! 8658163
-78.9375 33.65625 ! 8661070
-79.9375 32.78125 ! 8665530
-80.875 32.03125 ! 8670870
-79.6875 32.84375 ! 8664941
-80.4375 32.34375 ! 8668498
-78.5 33.875 ! 8659897
-75.625 35.21875 ! 8654400
-75.74669647216797 36.18330001831055 ! 8651370
-75.54818725585938 35.79568862915039 ! 8652587
-75.70419311523438 35.20861053466797 ! 8654467
-76.67066192626953 34.71733093261719 ! 8656483
-77.95361328125 34.227500915527344 ! 8658120
-77.78668975830078 34.21331024169922 ! 8658163
-78.91638946533203 33.65549850463867 ! 8661070
-79.9236068725586 32.78083038330078 ! 8665530
-80.90303039550781 32.034690856933594 ! 8670870
-79.70670318603516 32.8567008972168 ! 8664941
-80.46499633789062 32.34000015258789 ! 8668498
-78.50669860839844 33.8650016784668 ! 8659897
-75.63500213623047 35.22330093383789 ! 8654400
13 ! NSTAV
-75.75 36.1875 ! 8651370
-75.5625 35.78125 ! 8652587
-75.6875 35.21875 ! 8654467
-76.6875 34.71875 ! 8656483
-77.9375 34.21875 ! 8658120
-77.8125 34.21875 ! 8658163
-78.9375 33.65625 ! 8661070
-79.9375 32.78125 ! 8665530
-80.875 32.03125 ! 8670870
-79.6875 32.84375 ! 8664941
-80.4375 32.34375 ! 8668498
-78.5 33.875 ! 8659897
-75.625 35.21875 ! 8654400
-75.74669647216797 36.18330001831055 ! 8651370
-75.54818725585938 35.79568862915039 ! 8652587
-75.70419311523438 35.20861053466797 ! 8654467
-76.67066192626953 34.71733093261719 ! 8656483
-77.95361328125 34.227500915527344 ! 8658120
-77.78668975830078 34.21331024169922 ! 8658163
-78.91638946533203 33.65549850463867 ! 8661070
-79.9236068725586 32.78083038330078 ! 8665530
-80.90303039550781 32.034690856933594 ! 8670870
-79.70670318603516 32.8567008972168 ! 8664941
-80.46499633789062 32.34000015258789 ! 8668498
-78.50669860839844 33.8650016784668 ! 8659897
-75.63500213623047 35.22330093383789 ! 8654400
13 ! NSTAC
-75.75 36.1875 ! 8651370
-75.5625 35.78125 ! 8652587
-75.6875 35.21875 ! 8654467
-76.6875 34.71875 ! 8656483
-77.9375 34.21875 ! 8658120
-77.8125 34.21875 ! 8658163
-78.9375 33.65625 ! 8661070
-79.9375 32.78125 ! 8665530
-80.875 32.03125 ! 8670870
-79.6875 32.84375 ! 8664941
-80.4375 32.34375 ! 8668498
-78.5 33.875 ! 8659897
-75.625 35.21875 ! 8654400
-75.74669647216797 36.18330001831055 ! 8651370
-75.54818725585938 35.79568862915039 ! 8652587
-75.70419311523438 35.20861053466797 ! 8654467
-76.67066192626953 34.71733093261719 ! 8656483
-77.95361328125 34.227500915527344 ! 8658120
-77.78668975830078 34.21331024169922 ! 8658163
-78.91638946533203 33.65549850463867 ! 8661070
-79.9236068725586 32.78083038330078 ! 8665530
-80.90303039550781 32.034690856933594 ! 8670870
-79.70670318603516 32.8567008972168 ! 8664941
-80.46499633789062 32.34000015258789 ! 8668498
-78.50669860839844 33.8650016784668 ! 8659897
-75.63500213623047 35.22330093383789 ! 8654400
13 ! NSTAM
-75.75 36.1875 ! 8651370
-75.5625 35.78125 ! 8652587
-75.6875 35.21875 ! 8654467
-76.6875 34.71875 ! 8656483
-77.9375 34.21875 ! 8658120
-77.8125 34.21875 ! 8658163
-78.9375 33.65625 ! 8661070
-79.9375 32.78125 ! 8665530
-80.875 32.03125 ! 8670870
-79.6875 32.84375 ! 8664941
-80.4375 32.34375 ! 8668498
-78.5 33.875 ! 8659897
-75.625 35.21875 ! 8654400
-75.74669647216797 36.18330001831055 ! 8651370
-75.54818725585938 35.79568862915039 ! 8652587
-75.70419311523438 35.20861053466797 ! 8654467
-76.67066192626953 34.71733093261719 ! 8656483
-77.95361328125 34.227500915527344 ! 8658120
-77.78668975830078 34.21331024169922 ! 8658163
-78.91638946533203 33.65549850463867 ! 8661070
-79.9236068725586 32.78083038330078 ! 8665530
-80.90303039550781 32.034690856933594 ! 8670870
-79.70670318603516 32.8567008972168 ! 8664941
-80.46499633789062 32.34000015258789 ! 8668498
-78.50669860839844 33.8650016784668 ! 8659897
-75.63500213623047 35.22330093383789 ! 8654400
26 changes: 13 additions & 13 deletions tests/data/reference/test_Stations/stations_2.fort.15
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
13 ! NSTAE
-75.75 36.1875 ! 8651370
-75.5625 35.78125 ! 8652587
-75.6875 35.21875 ! 8654467
-76.6875 34.71875 ! 8656483
-77.9375 34.21875 ! 8658120
-77.8125 34.21875 ! 8658163
-78.9375 33.65625 ! 8661070
-79.9375 32.78125 ! 8665530
-80.875 32.03125 ! 8670870
-79.6875 32.84375 ! 8664941
-80.4375 32.34375 ! 8668498
-78.5 33.875 ! 8659897
-75.625 35.21875 ! 8654400
-75.74669647216797 36.18330001831055 ! 8651370
-75.54818725585938 35.79568862915039 ! 8652587
-75.70419311523438 35.20861053466797 ! 8654467
-76.67066192626953 34.71733093261719 ! 8656483
-77.95361328125 34.227500915527344 ! 8658120
-77.78668975830078 34.21331024169922 ! 8658163
-78.91638946533203 33.65549850463867 ! 8661070
-79.9236068725586 32.78083038330078 ! 8665530
-80.90303039550781 32.034690856933594 ! 8670870
-79.70670318603516 32.8567008972168 ! 8664941
-80.46499633789062 32.34000015258789 ! 8668498
-78.50669860839844 33.8650016784668 ! 8659897
-75.63500213623047 35.22330093383789 ! 8654400
8 changes: 4 additions & 4 deletions tests/data/reference/test_Stations/stations_3.fort.15
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
3 ! NSTAE
-77.9375 34.21875 ! 8658120
-80.875 32.03125 ! 8670870
-75.5625 35.78125 ! 8652587
-77.95361328125 34.227500915527344 ! 8658120
-80.90303039550781 32.034690856933594 ! 8670870
-75.54818725585938 35.79568862915039 ! 8652587
1 ! NSTAV
-77.9375 34.21875 ! 8658120
-77.95361328125 34.227500915527344 ! 8658120

0 comments on commit fd002a8

Please sign in to comment.