Skip to content

Commit 9921f13

Browse files
molinavmolinav
committed
Merge branch 'release-1.4.0'
2 parents 2eac57f + b5a71ee commit 9921f13

157 files changed

Lines changed: 2942 additions & 1794 deletions

File tree

Some content is hidden

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

‎.github/workflows/basemap-data-hires.yml‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ name: basemap-data-hires
22

33
env:
44
PKGDIR: "packages/basemap_data_hires"
5-
PYTHONWARNINGS: "ignore:DEPRECATION"
5+
PIP_DEFAULT_TIMEOUT: 10
66
PIP_DISABLE_PIP_VERSION_CHECK: 1
77
PIP_PREFER_BINARY: 1
8-
PIP_TIMEOUT: 10
98
PIP_RETRIES: 0
9+
PYTHONUNBUFFERED: "1"
10+
PYTHONWARNINGS: "ignore:DEPRECATION"
1011

1112
on:
1213
push:
@@ -29,7 +30,7 @@ jobs:
2930
uses: actions/checkout@v3
3031
-
3132
name: Upload checkout
32-
uses: actions/upload-artifact@v1
33+
uses: actions/upload-artifact@v3
3334
with:
3435
name: checkout
3536
path: .
@@ -42,11 +43,11 @@ jobs:
4243
max-parallel: 1
4344
needs: checkout
4445
runs-on: ubuntu-latest
45-
container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
46+
container: "pylegacy/python:${{ matrix.python-version }}-debian-9"
4647
steps:
4748
-
4849
name: Download checkout
49-
uses: actions/download-artifact@v1
50+
uses: actions/download-artifact@v3
5051
with:
5152
name: checkout
5253
path: .
@@ -58,7 +59,7 @@ jobs:
5859
pip wheel -w dist --no-deps dist/*.zip
5960
-
6061
name: Upload build artifacts
61-
uses: actions/upload-artifact@v1
62+
uses: actions/upload-artifact@v3
6263
with:
6364
name: artifacts-build
6465
path: ${{ env.PKGDIR }}/dist
@@ -73,17 +74,17 @@ jobs:
7374
fail-fast: false
7475
needs: build
7576
runs-on: ubuntu-latest
76-
container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
77+
container: "pylegacy/python:${{ matrix.python-version }}-debian-9"
7778
steps:
7879
-
7980
name: Download checkout
80-
uses: actions/download-artifact@v1
81+
uses: actions/download-artifact@v3
8182
with:
8283
name: checkout
8384
path: .
8485
-
8586
name: Download build artifacts
86-
uses: actions/download-artifact@v1
87+
uses: actions/download-artifact@v3
8788
with:
8889
name: artifacts-build
8990
path: ${{ env.PKGDIR }}/dist
@@ -105,29 +106,32 @@ jobs:
105106
if: startsWith(github.event.ref, 'refs/tags/v')
106107
needs: test
107108
runs-on: ubuntu-latest
108-
container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
109+
container: "pylegacy/python:${{ matrix.python-version }}-debian-9"
109110
environment: PyPI
110111
steps:
111112
-
112113
name: Download build artifacts
113-
uses: actions/download-artifact@v1
114+
uses: actions/download-artifact@v3
114115
with:
115116
name: artifacts-build
116117
path: ${{ env.PKGDIR }}/dist
117118
-
118119
name: Install upload requirements
119120
run: |
120121
pip install twine
122+
-
123+
name: Check distributables
124+
run: |
125+
python -m twine check \
126+
${{ env.PKGDIR }}/dist/*.zip \
127+
${{ env.PKGDIR }}/dist/*.whl
121128
-
122129
name: Upload distributables
123130
env:
124131
TWINE_USERNAME: __token__
125132
TWINE_PASSWORD: "${{ secrets.PYPI_TOKEN }}"
126133
TWINE_REPOSITORY_URL: "${{ secrets.PYPI_REPOSITORY_URL }}"
127134
run: |
128-
python -m twine check \
129-
${{ env.PKGDIR }}/dist/*.zip \
130-
${{ env.PKGDIR }}/dist/*.whl
131135
python -m twine upload --skip-existing \
132136
${{ env.PKGDIR }}/dist/*.zip \
133137
${{ env.PKGDIR }}/dist/*.whl

‎.github/workflows/basemap-data.yml‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ name: basemap-data
22

33
env:
44
PKGDIR: "packages/basemap_data"
5-
PYTHONWARNINGS: "ignore:DEPRECATION"
5+
PIP_DEFAULT_TIMEOUT: 10
66
PIP_DISABLE_PIP_VERSION_CHECK: 1
77
PIP_PREFER_BINARY: 1
8-
PIP_TIMEOUT: 10
98
PIP_RETRIES: 0
9+
PYTHONUNBUFFERED: "1"
10+
PYTHONWARNINGS: "ignore:DEPRECATION"
1011

1112
on:
1213
push:
@@ -29,7 +30,7 @@ jobs:
2930
uses: actions/checkout@v3
3031
-
3132
name: Upload checkout
32-
uses: actions/upload-artifact@v1
33+
uses: actions/upload-artifact@v3
3334
with:
3435
name: checkout
3536
path: .
@@ -42,11 +43,11 @@ jobs:
4243
max-parallel: 1
4344
needs: checkout
4445
runs-on: ubuntu-latest
45-
container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
46+
container: "pylegacy/python:${{ matrix.python-version }}-debian-9"
4647
steps:
4748
-
4849
name: Download checkout
49-
uses: actions/download-artifact@v1
50+
uses: actions/download-artifact@v3
5051
with:
5152
name: checkout
5253
path: .
@@ -58,7 +59,7 @@ jobs:
5859
pip wheel -w dist --no-deps dist/*.zip
5960
-
6061
name: Upload build artifacts
61-
uses: actions/upload-artifact@v1
62+
uses: actions/upload-artifact@v3
6263
with:
6364
name: artifacts-build
6465
path: ${{ env.PKGDIR }}/dist
@@ -73,17 +74,17 @@ jobs:
7374
fail-fast: false
7475
needs: build
7576
runs-on: ubuntu-latest
76-
container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
77+
container: "pylegacy/python:${{ matrix.python-version }}-debian-9"
7778
steps:
7879
-
7980
name: Download checkout
80-
uses: actions/download-artifact@v1
81+
uses: actions/download-artifact@v3
8182
with:
8283
name: checkout
8384
path: .
8485
-
8586
name: Download build artifacts
86-
uses: actions/download-artifact@v1
87+
uses: actions/download-artifact@v3
8788
with:
8889
name: artifacts-build
8990
path: ${{ env.PKGDIR }}/dist
@@ -105,29 +106,32 @@ jobs:
105106
if: startsWith(github.event.ref, 'refs/tags/v')
106107
needs: test
107108
runs-on: ubuntu-latest
108-
container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
109+
container: "pylegacy/python:${{ matrix.python-version }}-debian-9"
109110
environment: PyPI
110111
steps:
111112
-
112113
name: Download build artifacts
113-
uses: actions/download-artifact@v1
114+
uses: actions/download-artifact@v3
114115
with:
115116
name: artifacts-build
116117
path: ${{ env.PKGDIR }}/dist
117118
-
118119
name: Install upload requirements
119120
run: |
120121
pip install twine
122+
-
123+
name: Check distributables
124+
run: |
125+
python -m twine check \
126+
${{ env.PKGDIR }}/dist/*.zip \
127+
${{ env.PKGDIR }}/dist/*.whl
121128
-
122129
name: Upload distributables
123130
env:
124131
TWINE_USERNAME: __token__
125132
TWINE_PASSWORD: "${{ secrets.PYPI_TOKEN }}"
126133
TWINE_REPOSITORY_URL: "${{ secrets.PYPI_REPOSITORY_URL }}"
127134
run: |
128-
python -m twine check \
129-
${{ env.PKGDIR }}/dist/*.zip \
130-
${{ env.PKGDIR }}/dist/*.whl
131135
python -m twine upload --skip-existing \
132136
${{ env.PKGDIR }}/dist/*.zip \
133137
${{ env.PKGDIR }}/dist/*.whl

0 commit comments

Comments
 (0)