Skip to content

Commit a6022cf

Browse files
authored
ci: update workflows (#73)
* ci: update workflows * ci: fix travis * ci: drop macOS and Python 2.7 on Linux
1 parent 3b45355 commit a6022cf

File tree

3 files changed

+17
-55
lines changed

3 files changed

+17
-55
lines changed

.github/dependabot.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ updates:
66
schedule:
77
interval: "daily"
88
ignore:
9-
# Offical actions have moving tags like v1
9+
# Official actions have moving tags like v1
1010
# that are used, so they don't need updates here
11-
- dependency-name: "actions/*"
11+
- dependency-name: "actions/checkout"
12+
- dependency-name: "actions/setup-python"
13+
- dependency-name: "actions/cache"
14+
- dependency-name: "actions/upload-artifact"
15+
- dependency-name: "actions/download-artifact"
16+
- dependency-name: "actions/labeler"

.github/workflows/wheels.yml

+7-30
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,12 @@ jobs:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- uses: actions/checkout@v2
23-
- uses: actions/setup-python@v2
24-
25-
- name: Install deps
26-
run: python -m pip install twine build
2723

2824
- name: Build SDist
29-
run: python -m build -s
25+
run: pipx run build --sdist
3026

3127
- name: Check metadata
32-
run: twine check dist/*
28+
run: pipx run twine check dist/*
3329

3430
- uses: actions/upload-artifact@v2
3531
with:
@@ -47,22 +43,12 @@ jobs:
4743
steps:
4844
- uses: actions/checkout@v2
4945

50-
- uses: actions/setup-python@v2
51-
52-
- name: Install cibuildwheel
53-
run: python -m pip install cibuildwheel==1.6.3
54-
55-
- name: Build wheel
56-
run: python -m cibuildwheel --output-dir wheelhouse
46+
- uses: joerick/[email protected]
5747
env:
5848
# Python 2.7 on Windows requires a workaround for C++11 support,
5949
# built separately below
6050
CIBW_SKIP: cp27-win*
6151

62-
- name: Show files
63-
run: ls -lh wheelhouse
64-
shell: bash
65-
6652
- name: Verify clean directory
6753
run: git diff --exit-code
6854
shell: bash
@@ -79,19 +65,14 @@ jobs:
7965
runs-on: windows-latest
8066

8167
steps:
82-
- uses: actions/checkout@v1
68+
- uses: actions/checkout@v2
8369
with:
8470
submodules: true
8571

86-
- uses: actions/setup-python@v2
87-
88-
- name: Install cibuildwheel
89-
run: python -m pip install cibuildwheel==1.6.3
90-
9172
- uses: ilammy/msvc-dev-cmd@v1
9273

9374
- name: Build 64-bit wheel
94-
run: python -m cibuildwheel --output-dir wheelhouse
75+
uses: joerick/cibuildwheel@v1.10.0
9576
env:
9677
CIBW_BUILD: cp27-win_amd64
9778
DISTUTILS_USE_SDK: 1
@@ -102,16 +83,12 @@ jobs:
10283
arch: x86
10384

10485
- name: Build 32-bit wheel
105-
run: python -m cibuildwheel --output-dir wheelhouse
86+
uses: joerick/cibuildwheel@v1.10.0
10687
env:
10788
CIBW_BUILD: cp27-win32
10889
DISTUTILS_USE_SDK: 1
10990
MSSdk: 1
11091

111-
- name: Show files
112-
run: ls -lh wheelhouse
113-
shell: bash
114-
11592
- name: Verify clean directory
11693
run: git diff --exit-code
11794
shell: bash
@@ -135,7 +112,7 @@ jobs:
135112
name: artifact
136113
path: dist
137114

138-
- uses: pypa/[email protected].1
115+
- uses: pypa/[email protected].2
139116
with:
140117
user: __token__
141118
password: ${{ secrets.pypi_password }}

.travis.yml

+3-23
Original file line numberDiff line numberDiff line change
@@ -3,38 +3,18 @@ dist: trusty
33
matrix:
44
include:
55
- os: linux
6-
env: PYTHON=2.7
6+
env: PYTHON=3.8
77
- os: linux
8-
env: PYTHON=3.6
9-
- os: linux
10-
env: CONDA=3.7
11-
- os: linux
12-
env: CONDA=3.6
13-
- os: osx
14-
env: PYTHON=2.7
15-
- os: osx
16-
env: PYTHON=3.6
17-
- os: osx
188
env: CONDA=3.7
19-
- os: osx
20-
env: CONDA=3.6
219
before_install:
2210
- |
23-
if [ "$TRAVIS_OS_NAME" = "linux" ]; then export CXX=g++-4.8 CC=gcc-4.8; fi
11+
export CXX=g++-4.8 CC=gcc-4.8
2412
if [ -n "$PYTHON" ]; then
25-
if [ "$TRAVIS_OS_NAME" = "osx" ]; then
26-
export PATH="/Users/travis/Library/Python/2.7/bin:$PATH"
27-
export MACOSX_DEPLOYMENT_TARGET="10.13"
28-
if [ "${PYTHON:0:1}" = "3" ]; then
29-
brew update; brew install python3;
30-
fi
31-
fi
3213
python -m pip install --user virtualenv
3314
virtualenv -p python${PYTHON:0:1} venv
3415
source venv/bin/activate
3516
elif [ -n "$CONDA" ]; then
36-
if [ "$TRAVIS_OS_NAME" = "linux" ]; then OS=Linux-x86_64; else OS=MacOSX-x86_64; fi
37-
wget -O miniconda.sh https://repo.continuum.io/miniconda/Miniconda${CONDA:0:1}-latest-$OS.sh
17+
wget -O miniconda.sh https://repo.continuum.io/miniconda/Miniconda${CONDA:0:1}-latest-Linux-x86_64.sh
3818
bash miniconda.sh -b -p $HOME/miniconda
3919
export PATH="$HOME/miniconda/bin:$PATH"
4020
conda config --set always_yes yes --set changeps1 no

0 commit comments

Comments
 (0)