From 12074005ce3bed8ea33517acff037c0ce79d8cd4 Mon Sep 17 00:00:00 2001 From: "Soroosh.Mani" Date: Wed, 30 Aug 2023 16:33:46 -0400 Subject: [PATCH 1/4] Ignore init arguments that are added and passed through classmethods that create VortexTrack subclass objects --- adcircpy/forcing/winds/best_track.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/adcircpy/forcing/winds/best_track.py b/adcircpy/forcing/winds/best_track.py index 6d55b3f4..3dc25bf6 100644 --- a/adcircpy/forcing/winds/best_track.py +++ b/adcircpy/forcing/winds/best_track.py @@ -29,6 +29,8 @@ def __init__( interval_seconds: int = None, start_date: datetime = None, end_date: datetime = None, + *args, + **kwargs, ): if nws is None: nws = 20 From 81bbc206a479885f4317a82c38b922918ff02589 Mon Sep 17 00:00:00 2001 From: "Soroosh.Mani" Date: Wed, 30 Aug 2023 16:51:12 -0400 Subject: [PATCH 2/4] Update ref files due to order change in upstream response --- .../test_Stations/stations_1.fort.15 | 32 +++++++++---------- .../test_Stations/stations_2.fort.15 | 8 ++--- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/data/reference/test_Stations/stations_1.fort.15 b/tests/data/reference/test_Stations/stations_1.fort.15 index 7417232f..659401c0 100644 --- a/tests/data/reference/test_Stations/stations_1.fort.15 +++ b/tests/data/reference/test_Stations/stations_1.fort.15 @@ -2,12 +2,12 @@ -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.9236068725586 32.78083038330078 ! 8665530 +-77.78668975830078 34.21331024169922 ! 8658163 +-78.91638946533203 33.65555953979492 ! 8661070 +-76.67066192626953 34.71733093261719 ! 8656483 -79.70670318603516 32.8567008972168 ! 8664941 -80.46499633789062 32.34000015258789 ! 8668498 -78.50669860839844 33.8650016784668 ! 8659897 @@ -16,12 +16,12 @@ -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.9236068725586 32.78083038330078 ! 8665530 +-77.78668975830078 34.21331024169922 ! 8658163 +-78.91638946533203 33.65555953979492 ! 8661070 +-76.67066192626953 34.71733093261719 ! 8656483 -79.70670318603516 32.8567008972168 ! 8664941 -80.46499633789062 32.34000015258789 ! 8668498 -78.50669860839844 33.8650016784668 ! 8659897 @@ -30,12 +30,12 @@ -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.9236068725586 32.78083038330078 ! 8665530 +-77.78668975830078 34.21331024169922 ! 8658163 +-78.91638946533203 33.65555953979492 ! 8661070 +-76.67066192626953 34.71733093261719 ! 8656483 -79.70670318603516 32.8567008972168 ! 8664941 -80.46499633789062 32.34000015258789 ! 8668498 -78.50669860839844 33.8650016784668 ! 8659897 @@ -44,12 +44,12 @@ -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.9236068725586 32.78083038330078 ! 8665530 +-77.78668975830078 34.21331024169922 ! 8658163 +-78.91638946533203 33.65555953979492 ! 8661070 +-76.67066192626953 34.71733093261719 ! 8656483 -79.70670318603516 32.8567008972168 ! 8664941 -80.46499633789062 32.34000015258789 ! 8668498 -78.50669860839844 33.8650016784668 ! 8659897 diff --git a/tests/data/reference/test_Stations/stations_2.fort.15 b/tests/data/reference/test_Stations/stations_2.fort.15 index 3eb6b87a..fd67bdec 100644 --- a/tests/data/reference/test_Stations/stations_2.fort.15 +++ b/tests/data/reference/test_Stations/stations_2.fort.15 @@ -2,12 +2,12 @@ -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.9236068725586 32.78083038330078 ! 8665530 +-77.78668975830078 34.21331024169922 ! 8658163 +-78.91638946533203 33.65555953979492 ! 8661070 +-76.67066192626953 34.71733093261719 ! 8656483 -79.70670318603516 32.8567008972168 ! 8664941 -80.46499633789062 32.34000015258789 ! 8668498 -78.50669860839844 33.8650016784668 ! 8659897 From 70129d74d887ef47bcd9d83a0dce0c55e2a2bf5b Mon Sep 17 00:00:00 2001 From: "Soroosh.Mani" Date: Wed, 30 Aug 2023 16:56:59 -0400 Subject: [PATCH 3/4] Fix for GitHub CI test --- .github/workflows/quick_test.yml | 16 ++++++++++------ pyproject.toml | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/quick_test.yml b/.github/workflows/quick_test.yml index c7ac08ee..9d2d33cf 100644 --- a/.github/workflows/quick_test.yml +++ b/.github/workflows/quick_test.yml @@ -15,12 +15,14 @@ jobs: runs-on: ubuntu-latest steps: - name: clone repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: install Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 + with: + python-version: '3.x' - name: load cached Python installation id: cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ env.pythonLocation }} key: lint-${{ runner.os }}-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }} @@ -40,12 +42,14 @@ jobs: runs-on: ubuntu-latest steps: - name: clone repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: install Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 + with: + python-version: '3.11' - name: load cached Python installation id: cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ env.pythonLocation }} key: test-${{ runner.os }}-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }} diff --git a/pyproject.toml b/pyproject.toml index cb1a9357..5479ee59 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,7 +24,7 @@ appdirs = '*' geopandas = '<0.11' haversine = '*' matplotlib = '*' -netCDF4 = '<1.6' +netCDF4 = '*' numpy = '*' pandas = '*' paramiko = '*' From 172aeecb4a14bd6c0ba19dcf74f168383bb39081 Mon Sep 17 00:00:00 2001 From: "Soroosh.Mani" Date: Wed, 30 Aug 2023 18:04:53 -0400 Subject: [PATCH 4/4] Update all actions with latest available versions --- .github/workflows/quick_test.yml | 2 +- .github/workflows/tests.yml | 24 ++++++++++++++---------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.github/workflows/quick_test.yml b/.github/workflows/quick_test.yml index 9d2d33cf..750be816 100644 --- a/.github/workflows/quick_test.yml +++ b/.github/workflows/quick_test.yml @@ -46,7 +46,7 @@ jobs: - name: install Python uses: actions/setup-python@v4 with: - python-version: '3.11' + python-version: '3.x' - name: load cached Python installation id: cache uses: actions/cache@v3 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f8295a56..2d24b03b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,12 +18,14 @@ jobs: runs-on: ubuntu-latest steps: - name: clone repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: install Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 + with: + python-version: '3.x' - name: load cached Python installation id: cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ env.pythonLocation }} key: lint-${{ runner.os }}-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }} @@ -44,20 +46,20 @@ jobs: strategy: matrix: os: [ ubuntu-latest, macos-latest ] - python-version: [ '3.8', '3.9', '3.x' ] + python-version: [ '3.8', '3.9', '3.10', '3.x' ] exclude: - os: macos-latest python-version: '3.x' steps: - name: clone repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: install Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: load cached Python installation id: cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ env.pythonLocation }} key: test-${{ runner.os }}-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }} @@ -82,12 +84,14 @@ jobs: runs-on: ubuntu-latest steps: - name: clone repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: install Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 + with: + python-version: '3.x' - name: load cached Python installation id: cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ env.pythonLocation }} key: test-${{ runner.os }}-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}