From 428b06365e3dcf773c52db498a6ab7fefc355812 Mon Sep 17 00:00:00 2001 From: Hugo Date: Wed, 8 Jan 2020 15:41:48 +0200 Subject: [PATCH] Move scripts from .travis to .ci because they're also used by GitHub Actions --- {.travis => .ci}/after_success.sh | 0 {.travis => .ci}/build.sh | 0 {.travis => .ci}/install.sh | 0 {.travis => .ci}/test.sh | 0 .github/workflows/test-docker.yml | 2 +- .github/workflows/test.yml | 12 ++++++------ .travis.yml | 8 ++++---- MANIFEST.in | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) rename {.travis => .ci}/after_success.sh (100%) rename {.travis => .ci}/build.sh (100%) rename {.travis => .ci}/install.sh (100%) rename {.travis => .ci}/test.sh (100%) diff --git a/.travis/after_success.sh b/.ci/after_success.sh similarity index 100% rename from .travis/after_success.sh rename to .ci/after_success.sh diff --git a/.travis/build.sh b/.ci/build.sh similarity index 100% rename from .travis/build.sh rename to .ci/build.sh diff --git a/.travis/install.sh b/.ci/install.sh similarity index 100% rename from .travis/install.sh rename to .ci/install.sh diff --git a/.travis/test.sh b/.ci/test.sh similarity index 100% rename from .travis/test.sh rename to .ci/test.sh diff --git a/.github/workflows/test-docker.yml b/.github/workflows/test-docker.yml index 1a6eaac69..503d26283 100644 --- a/.github/workflows/test-docker.yml +++ b/.github/workflows/test-docker.yml @@ -50,7 +50,7 @@ jobs: pip install wheel sudo apt-get install -qq ruby-dev PATH="$PATH:~/.local/bin" - .travis/after_success.sh + .ci/after_success.sh env: COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8c80bcd71..fa98e2847 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,7 +36,7 @@ jobs: with: path: ~/.cache/pip key: - ${{ matrix.os }}-${{ matrix.python-version }}-${{ hashFiles('**/.travis/*.sh') }} + ${{ matrix.os }}-${{ matrix.python-version }}-${{ hashFiles('**/.ci/*.sh') }} restore-keys: | ${{ matrix.os }}-${{ matrix.python-version }}- @@ -46,7 +46,7 @@ jobs: with: path: ~/Library/Caches/pip key: - ${{ matrix.os }}-${{ matrix.python-version }}-${{ hashFiles('**/.travis/*.sh') }} + ${{ matrix.os }}-${{ matrix.python-version }}-${{ hashFiles('**/.ci/*.sh') }} restore-keys: | ${{ matrix.os }}-${{ matrix.python-version }}- @@ -61,7 +61,7 @@ jobs: - name: Install Linux dependencies if: startsWith(matrix.os, 'ubuntu') run: | - .travis/install.sh + .ci/install.sh - name: Install macOS dependencies if: startsWith(matrix.os, 'macOS') @@ -70,11 +70,11 @@ jobs: - name: Build run: | - .travis/build.sh + .ci/build.sh - name: Test run: | - .travis/test.sh + .ci/test.sh - name: Upload errors uses: actions/upload-artifact@v1 @@ -86,7 +86,7 @@ jobs: - name: After success if: success() run: | - .travis/after_success.sh + .ci/after_success.sh env: MATRIX_OS: ${{ matrix.os }} COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} diff --git a/.travis.yml b/.travis.yml index 8d145b405..038bf0b76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,7 @@ install: if [ "$LINT" == "true" ]; then pip install tox else - .travis/install.sh; + .ci/install.sh; fi script: @@ -53,12 +53,12 @@ script: if [ "$LINT" == "true" ]; then tox -e lint else - .travis/build.sh - .travis/test.sh + .ci/build.sh + .ci/test.sh fi after_success: - | if [ "$LINT" == "" ]; then - .travis/after_success.sh + .ci/after_success.sh fi diff --git a/MANIFEST.in b/MANIFEST.in index 79f4e2adb..178bf477e 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -26,4 +26,4 @@ global-exclude .git* global-exclude *.pyc global-exclude *.so prune .azure-pipelines -prune .travis +prune .ci