Skip to content

Commit ee787f1

Browse files
authored
Merge pull request #722 from icesat2py/development
release v2.0.1
2 parents da1abd4 + 966f926 commit ee787f1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+10224
-8511
lines changed

.all-contributorsrc

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,17 @@
512512
"avatar_url": "https://avatars.githubusercontent.com/u/5607545?v=4",
513513
"profile": "https://developmentseed.org/",
514514
"contributions": [
515-
"infra"
515+
"infra",
516+
"review"
517+
]
518+
},
519+
{
520+
"login": "emmanuel-ferdman",
521+
"name": "Emmanuel Ferdman",
522+
"avatar_url": "https://avatars.githubusercontent.com/u/35470921?v=4",
523+
"profile": "https://github.com/emmanuel-ferdman",
524+
"contributions": [
525+
"code"
516526
]
517527
}
518528
],

.github/actions/install-icepyx/action.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

.github/workflows/download_test.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

.github/workflows/get_pypi_stats.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
# Steps represent a sequence of tasks that will be executed as part of the job
1717
steps:
1818
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2020
with:
2121
ref: "traffic"
2222

@@ -29,7 +29,7 @@ jobs:
2929
3030
# Commits files to repository
3131
- name: Commit changes
32-
uses: EndBug/add-and-commit@v9
32+
uses: EndBug/add-and-commit@a94899bca583c204427a224a7af87c02f9b325d5 # v9.1.4
3333
with:
3434
author_name: learn2phoenix
3535
message: "Pypi stats auto-update"

.github/workflows/integration_test.yml

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
name: "Integration test"
2-
# NOTE: This runs all integration tests except those that download data.
2+
# NOTE: This runs all integration tests, including some that download data.
33
# It will not automatically run integration tests (some of which require auth)
44
# on PRs from forks.
5-
# Integration tests that download data are run separately.
65

76

87
on:
@@ -29,7 +28,7 @@ jobs:
2928
steps:
3029
- name: "Fetch user permission"
3130
id: "permission"
32-
uses: "actions-cool/check-user-permission@v2"
31+
uses: "actions-cool/check-user-permission@7b90a27f92f3961b368376107661682c441f6103" # v2.3.0
3332
with:
3433
require: "write"
3534
username: "${{ github.triggering_actor }}"
@@ -48,21 +47,31 @@ jobs:
4847
exit 1
4948
5049
- name: "Checkout source"
51-
uses: "actions/checkout@v4"
50+
uses: "actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8" # v5.0.0
51+
with:
52+
fetch-depth: 0
5253

53-
- uses: "./.github/actions/install-icepyx"
54+
- name: Set up Python
55+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
5456
with:
5557
python-version: "3.12"
5658

57-
- name: "Run auth tests"
59+
- name: "Install package and test dependencies"
60+
run: |
61+
python -m pip install .
62+
python -m pip install -r requirements-dev.txt
63+
64+
- name: "Run integration tests"
5865
env:
5966
EARTHDATA_USERNAME: "icepyx_devteam"
6067
EARTHDATA_PASSWORD: "${{ secrets.EARTHDATA_PASSWORD }}"
6168
NSIDC_LOGIN: "${{ secrets.EARTHDATA_PASSWORD }}"
6269
run: |
6370
pytest -s icepyx/tests/integration --verbose --cov app
71+
# Only run tests that [do not] download data
72+
# pytest icepyx/tests/integration --verbose --cov app -m "[not] downloads_data"
6473

6574
- name: "Upload coverage report"
66-
uses: "codecov/codecov-action@v5.4.0"
75+
uses: "codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7" # v5.5.1
6776
with:
6877
token: "${{ secrets.CODECOV_TOKEN }}"

.github/workflows/linter_actions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ jobs:
99
lint:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1313

1414
# Use the Ruff linter to annotate code style / best-practice issues
1515
# NOTE: More config provided in pyproject.toml
1616
- name: Lint and annotate PR
17-
uses: astral-sh/ruff-action@v3
17+
uses: astral-sh/ruff-action@57714a7c8a2e59f32539362ba31877a1957dded1 # v3.5.1

.github/workflows/publish_to_pypi.yml

Lines changed: 57 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,25 @@ on:
1212
# Trigger manually at https://github.com/icesat2py/icepyx/actions/workflows/publish_to_pypi.yml
1313
workflow_dispatch:
1414

15+
permissions: {}
16+
1517
jobs:
16-
publish-pypi:
17-
name: Publish to PyPI
18+
build:
19+
name: Build distribution 📦
1820
runs-on: ubuntu-latest
19-
if: github.repository == 'icesat2py/icepyx'
20-
permissions:
21-
id-token: write
2221

2322
steps:
2423
- name: Checkout
25-
uses: actions/checkout@v4
24+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2625
with:
2726
# fetch all history so that setuptools-scm works
2827
fetch-depth: 0
28+
persist-credentials: false
2929

3030
- name: Set up Python
31-
uses: actions/setup-python@v5
31+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
3232
with:
33-
python-version: 3.11
33+
python-version: '3.11'
3434

3535
- name: Install dependencies
3636
run: python -m pip install build setuptools wheel
@@ -51,11 +51,55 @@ jobs:
5151
echo "Generated files:"
5252
ls -lh dist/
5353
54-
- name: Publish to Test PyPI
55-
uses: pypa/gh-action-pypi-publish@release/v1
54+
- name: Store the distribution packages
55+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
56+
with:
57+
name: python-package-distributions
58+
path: dist/
59+
60+
61+
publish-to-testpypi:
62+
name: Publish Python 🐍 distribution 📦 to TestPyPI
63+
if: github.repository == 'icesat2py/icepyx'
64+
needs:
65+
- build
66+
runs-on: ubuntu-latest
67+
environment:
68+
name: testpypi
69+
url: https://test.pypi.org/project/icepyx
70+
permissions:
71+
id-token: write # IMPORTANT: mandatory for trusted OIDC publishing
72+
73+
steps:
74+
- name: Download all the dists
75+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
76+
with:
77+
name: python-package-distributions
78+
path: dist/
79+
80+
- name: Publish distribution 📦 to TestPyPI
81+
uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0
5682
with:
5783
repository-url: https://test.pypi.org/legacy/
5884

59-
- name: Publish to PyPI
60-
if: startsWith(github.ref, 'refs/tags')
61-
uses: pypa/gh-action-pypi-publish@release/v1
85+
publish-to-pypi:
86+
name: Publish Python 🐍 distribution 📦 to PyPI
87+
if: github.repository == 'icesat2py/icepyx' && startsWith(github.ref, 'refs/tags/')
88+
needs:
89+
- build
90+
runs-on: ubuntu-latest
91+
environment:
92+
name: pypi
93+
url: https://pypi.org/project/icepyx/
94+
permissions:
95+
id-token: write # IMPORTANT: mandatory for trusted OIDC publishing
96+
97+
steps:
98+
- name: Download all the dists
99+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
100+
with:
101+
name: python-package-distributions
102+
path: dist/
103+
104+
- name: Publish distribution 📦 to PyPI
105+
uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0

.github/workflows/traffic_action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
# Steps represent a sequence of tasks that will be executed as part of the job
1818
steps:
1919
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
20-
- uses: actions/checkout@v4
20+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2121
with:
2222
ref: "traffic"
2323

@@ -35,7 +35,7 @@ jobs:
3535
3636
# Commits files to repository
3737
- name: Commit changes
38-
uses: EndBug/add-and-commit@v9
38+
uses: EndBug/add-and-commit@a94899bca583c204427a224a7af87c02f9b325d5 # v9.1.4
3939
with:
4040
author_name: Jessica Scheick
4141
message: "GitHub traffic auto-update"

.github/workflows/typecheck.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
runs-on: ubuntu-latest
1414

1515
steps:
16-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1717
with:
1818
fetch-depth: 0
1919

20-
- uses: actions/setup-python@v5
20+
- uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
2121
with:
2222
python-version: "3.11"
2323

@@ -26,4 +26,4 @@ jobs:
2626
python -m pip install .[complete]
2727
python -m pip install -r requirements-dev.txt
2828
29-
- uses: jakebailey/pyright-action@v2
29+
- uses: jakebailey/pyright-action@6cabc0f01c4994be48fd45cd9dbacdd6e1ee6e5e # v2.3.3

.github/workflows/uml_action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Check out repository
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1616
with:
1717
ref: ${{ github.event.pull_request.head.ref }}
1818
- name: set up environment
@@ -29,7 +29,7 @@ jobs:
2929
rm ./packages_dev_uml.svg
3030
mv ./*.svg ./doc/source/user_guide/documentation/
3131
- name: Commit changes
32-
uses: EndBug/add-and-commit@v9
32+
uses: EndBug/add-and-commit@a94899bca583c204427a224a7af87c02f9b325d5 # v9.1.4
3333
with:
3434
author_name: GitHub Action
3535
message: "GitHub action UML generation auto-update"

0 commit comments

Comments
 (0)