diff --git a/.github/dependabot.yml b/.github/dependabot.yml index c1eac3c..7327336 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,6 +6,11 @@ updates: schedule: interval: "daily" ignore: - # Offical actions have moving tags like v1 + # Official actions have moving tags like v1 # that are used, so they don't need updates here - - dependency-name: "actions/*" + - dependency-name: "actions/checkout" + - dependency-name: "actions/setup-python" + - dependency-name: "actions/cache" + - dependency-name: "actions/upload-artifact" + - dependency-name: "actions/download-artifact" + - dependency-name: "actions/labeler" diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 5679998..6e7d944 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -20,16 +20,12 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 - - - name: Install deps - run: python -m pip install twine build - name: Build SDist - run: python -m build -s + run: pipx run build --sdist - name: Check metadata - run: twine check dist/* + run: pipx run twine check dist/* - uses: actions/upload-artifact@v2 with: @@ -47,22 +43,12 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 - - - name: Install cibuildwheel - run: python -m pip install cibuildwheel==1.6.3 - - - name: Build wheel - run: python -m cibuildwheel --output-dir wheelhouse + - uses: joerick/cibuildwheel@v1.10.0 env: # Python 2.7 on Windows requires a workaround for C++11 support, # built separately below CIBW_SKIP: cp27-win* - - name: Show files - run: ls -lh wheelhouse - shell: bash - - name: Verify clean directory run: git diff --exit-code shell: bash @@ -79,19 +65,14 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 with: submodules: true - - uses: actions/setup-python@v2 - - - name: Install cibuildwheel - run: python -m pip install cibuildwheel==1.6.3 - - uses: ilammy/msvc-dev-cmd@v1 - name: Build 64-bit wheel - run: python -m cibuildwheel --output-dir wheelhouse + uses: joerick/cibuildwheel@v1.10.0 env: CIBW_BUILD: cp27-win_amd64 DISTUTILS_USE_SDK: 1 @@ -102,16 +83,12 @@ jobs: arch: x86 - name: Build 32-bit wheel - run: python -m cibuildwheel --output-dir wheelhouse + uses: joerick/cibuildwheel@v1.10.0 env: CIBW_BUILD: cp27-win32 DISTUTILS_USE_SDK: 1 MSSdk: 1 - - name: Show files - run: ls -lh wheelhouse - shell: bash - - name: Verify clean directory run: git diff --exit-code shell: bash @@ -135,7 +112,7 @@ jobs: name: artifact path: dist - - uses: pypa/gh-action-pypi-publish@v1.4.1 + - uses: pypa/gh-action-pypi-publish@v1.4.2 with: user: __token__ password: ${{ secrets.pypi_password }} diff --git a/.travis.yml b/.travis.yml index 8af5883..4cda477 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,38 +3,18 @@ dist: trusty matrix: include: - os: linux - env: PYTHON=2.7 + env: PYTHON=3.8 - os: linux - env: PYTHON=3.6 - - os: linux - env: CONDA=3.7 - - os: linux - env: CONDA=3.6 - - os: osx - env: PYTHON=2.7 - - os: osx - env: PYTHON=3.6 - - os: osx env: CONDA=3.7 - - os: osx - env: CONDA=3.6 before_install: - | - if [ "$TRAVIS_OS_NAME" = "linux" ]; then export CXX=g++-4.8 CC=gcc-4.8; fi + export CXX=g++-4.8 CC=gcc-4.8 if [ -n "$PYTHON" ]; then - if [ "$TRAVIS_OS_NAME" = "osx" ]; then - export PATH="/Users/travis/Library/Python/2.7/bin:$PATH" - export MACOSX_DEPLOYMENT_TARGET="10.13" - if [ "${PYTHON:0:1}" = "3" ]; then - brew update; brew install python3; - fi - fi python -m pip install --user virtualenv virtualenv -p python${PYTHON:0:1} venv source venv/bin/activate elif [ -n "$CONDA" ]; then - if [ "$TRAVIS_OS_NAME" = "linux" ]; then OS=Linux-x86_64; else OS=MacOSX-x86_64; fi - wget -O miniconda.sh https://repo.continuum.io/miniconda/Miniconda${CONDA:0:1}-latest-$OS.sh + wget -O miniconda.sh https://repo.continuum.io/miniconda/Miniconda${CONDA:0:1}-latest-Linux-x86_64.sh bash miniconda.sh -b -p $HOME/miniconda export PATH="$HOME/miniconda/bin:$PATH" conda config --set always_yes yes --set changeps1 no