Skip to content

Commit 46f9acc

Browse files
molinavmolinav
committed
Merge beta release 1.3.0b2 into master
2 parents 2d6e5d1 + 0014ffd commit 46f9acc

File tree

11 files changed

+403
-333
lines changed

11 files changed

+403
-333
lines changed

‎.github/.travis.yml.bak

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

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

Lines changed: 22 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,19 @@ on:
1010
jobs:
1111

1212
build:
13-
runs-on: ubuntu-latest
1413
strategy:
1514
matrix:
16-
python_version:
15+
python-version:
1716
[
1817
"2.7",
1918
]
2019
max-parallel: 1
21-
container: "tinybases/python:${{ matrix.python_version }}-debian-4"
20+
runs-on: ubuntu-latest
21+
container: "pylegacy/python:${{ matrix.python-version }}-debian-4"
2222
steps:
2323
-
2424
name: Checkout
2525
uses: actions/checkout@v1
26-
-
27-
name: Print environment
28-
run: |
29-
set -e
30-
. /etc/profile
31-
python -V
3226
-
3327
name: Build wheel
3428
run: |
@@ -37,18 +31,16 @@ jobs:
3731
cd ${{ env.PKGDIR }}
3832
python setup.py sdist bdist_wheel --universal
3933
-
40-
name: Upload artifacts
34+
name: Upload build artifacts
4135
uses: actions/upload-artifact@v1
4236
with:
4337
name: artifacts-build
4438
path: ${{ env.PKGDIR }}/dist
4539

4640
test:
47-
needs: build
48-
runs-on: ubuntu-latest
4941
strategy:
5042
matrix:
51-
python_version:
43+
python-version:
5244
[
5345
"2.6",
5446
"2.7",
@@ -62,23 +54,19 @@ jobs:
6254
"3.9",
6355
]
6456
max-parallel: 5
65-
container: "tinybases/python:${{ matrix.python_version }}-debian-5"
57+
needs: build
58+
runs-on: ubuntu-latest
59+
container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
6660
steps:
6761
-
6862
name: Checkout
6963
uses: actions/checkout@v1
7064
-
71-
name: Download artifacts
65+
name: Download build artifacts
7266
uses: actions/download-artifact@v1
7367
with:
7468
name: artifacts-build
7569
path: ${{ env.PKGDIR }}/dist
76-
-
77-
name: Print environment
78-
run: |
79-
set -e
80-
. /etc/profile
81-
python -V
8270
-
8371
name: Install package
8472
run: |
@@ -93,34 +81,28 @@ jobs:
9381
python -c "from mpl_toolkits import basemap_data; print(basemap_data)"
9482
9583
upload:
96-
if: startsWith(github.event.ref, 'refs/tags/v')
97-
needs: test
98-
runs-on: ubuntu-latest
9984
strategy:
10085
matrix:
101-
python_version:
86+
python-version:
10287
[
10388
"2.7",
10489
]
10590
max-parallel: 1
106-
container: "tinybases/python:${{ matrix.python_version }}-debian-5"
107-
environment: PyPI
91+
if: startsWith(github.event.ref, 'refs/tags/v')
92+
needs: test
93+
runs-on: ubuntu-latest
94+
container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
95+
environment: Test PyPI
10896
steps:
10997
-
11098
name: Checkout
11199
uses: actions/checkout@v1
112100
-
113-
name: Download artifacts
101+
name: Download build artifacts
114102
uses: actions/download-artifact@v1
115103
with:
116104
name: artifacts-build
117105
path: ${{ env.PKGDIR }}/dist
118-
-
119-
name: Print environment
120-
run: |
121-
set -e
122-
. /etc/profile
123-
python -V
124106
-
125107
name: Install requirements
126108
run: |
@@ -136,5 +118,9 @@ jobs:
136118
run: |
137119
set -e
138120
. /etc/profile
139-
python -m twine check ${{ env.PKGDIR }}/dist/*
140-
python -m twine upload --skip-existing ${{ env.PKGDIR }}/dist/*
121+
python -m twine check \
122+
${{ env.PKGDIR }}/dist/*.zip \
123+
${{ env.PKGDIR }}/dist/*.whl
124+
python -m twine upload --skip-existing \
125+
${{ env.PKGDIR }}/dist/*.zip \
126+
${{ env.PKGDIR }}/dist/*.whl

‎.github/workflows/basemap-data.yml

Lines changed: 22 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,19 @@ on:
1010
jobs:
1111

1212
build:
13-
runs-on: ubuntu-latest
1413
strategy:
1514
matrix:
16-
python_version:
15+
python-version:
1716
[
1817
"2.7",
1918
]
2019
max-parallel: 1
21-
container: "tinybases/python:${{ matrix.python_version }}-debian-4"
20+
runs-on: ubuntu-latest
21+
container: "pylegacy/python:${{ matrix.python-version }}-debian-4"
2222
steps:
2323
-
2424
name: Checkout
2525
uses: actions/checkout@v1
26-
-
27-
name: Print environment
28-
run: |
29-
set -e
30-
. /etc/profile
31-
python -V
3226
-
3327
name: Build wheel
3428
run: |
@@ -37,18 +31,16 @@ jobs:
3731
cd ${{ env.PKGDIR }}
3832
python setup.py sdist bdist_wheel --universal
3933
-
40-
name: Upload artifacts
34+
name: Upload build artifacts
4135
uses: actions/upload-artifact@v1
4236
with:
4337
name: artifacts-build
4438
path: ${{ env.PKGDIR }}/dist
4539

4640
test:
47-
needs: build
48-
runs-on: ubuntu-latest
4941
strategy:
5042
matrix:
51-
python_version:
43+
python-version:
5244
[
5345
"2.6",
5446
"2.7",
@@ -62,23 +54,19 @@ jobs:
6254
"3.9",
6355
]
6456
max-parallel: 5
65-
container: "tinybases/python:${{ matrix.python_version }}-debian-5"
57+
needs: build
58+
runs-on: ubuntu-latest
59+
container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
6660
steps:
6761
-
6862
name: Checkout
6963
uses: actions/checkout@v1
7064
-
71-
name: Download artifacts
65+
name: Download build artifacts
7266
uses: actions/download-artifact@v1
7367
with:
7468
name: artifacts-build
7569
path: ${{ env.PKGDIR }}/dist
76-
-
77-
name: Print environment
78-
run: |
79-
set -e
80-
. /etc/profile
81-
python -V
8270
-
8371
name: Install package
8472
run: |
@@ -93,34 +81,28 @@ jobs:
9381
python -c "from mpl_toolkits import basemap_data; print(basemap_data)"
9482
9583
upload:
96-
if: startsWith(github.event.ref, 'refs/tags/v')
97-
needs: test
98-
runs-on: ubuntu-latest
9984
strategy:
10085
matrix:
101-
python_version:
86+
python-version:
10287
[
10388
"2.7",
10489
]
10590
max-parallel: 1
106-
container: "tinybases/python:${{ matrix.python_version }}-debian-5"
107-
environment: PyPI
91+
if: startsWith(github.event.ref, 'refs/tags/v')
92+
needs: test
93+
runs-on: ubuntu-latest
94+
container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
95+
environment: Test PyPI
10896
steps:
10997
-
11098
name: Checkout
11199
uses: actions/checkout@v1
112100
-
113-
name: Download artifacts
101+
name: Download build artifacts
114102
uses: actions/download-artifact@v1
115103
with:
116104
name: artifacts-build
117105
path: ${{ env.PKGDIR }}/dist
118-
-
119-
name: Print environment
120-
run: |
121-
set -e
122-
. /etc/profile
123-
python -V
124106
-
125107
name: Install requirements
126108
run: |
@@ -136,5 +118,9 @@ jobs:
136118
run: |
137119
set -e
138120
. /etc/profile
139-
python -m twine check ${{ env.PKGDIR }}/dist/*
140-
python -m twine upload --skip-existing ${{ env.PKGDIR }}/dist/*
121+
python -m twine check \
122+
${{ env.PKGDIR }}/dist/*.zip \
123+
${{ env.PKGDIR }}/dist/*.whl
124+
python -m twine upload --skip-existing \
125+
${{ env.PKGDIR }}/dist/*.zip \
126+
${{ env.PKGDIR }}/dist/*.whl

0 commit comments

Comments
 (0)