From 47a8d2721d08516e4b474be0f98c67ed5483c358 Mon Sep 17 00:00:00 2001 From: Stu Fisher Date: Fri, 12 Aug 2022 08:55:45 +0200 Subject: [PATCH 1/6] migrate ci --- .github/workflows/workflow.yml | 58 ++++++++++++++++++++++++++++++++++ .travis.yml | 43 ------------------------- 2 files changed, 58 insertions(+), 43 deletions(-) create mode 100644 .github/workflows/workflow.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml new file mode 100644 index 0000000..d17cdb7 --- /dev/null +++ b/.github/workflows/workflow.yml @@ -0,0 +1,58 @@ +name: CI + +on: [push] + +jobs: + lint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Set up Python + uses: actions/setup-python@v3 + - name: Run flake8 + uses: py-actions/flake8@v2 + + test: + runs-on: ubuntu-latest + strategy: + matrix: + python-version: ["3.6", "3.7", "3.8", "3.9"] + steps: + - uses: actions/checkout@v3 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v3 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + pip install -r dev-requirements.txt + pip install . + - name: Run tests + run: | + pytest --cov flask_apispec --cov-report xml + - name: Coverage report + uses: codecov/codecov-action@v2 + with: + files: ./coverage.xml + + build-n-publish: + name: Build and publish Python 🐍 distributions 📦 to PyPI + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + - name: Set up Python 3.10 + uses: actions/setup-python@v3 + with: + python-version: "3.10" + - name: Install dependencies + run: | + pip install setuptools wheel invoke + - name: Build a binary wheel and a source tarball + run: | + invoke install + python setup.py sdist bdist_wheel + - name: Publish distribution 📦 to PyPI + if: startsWith(github.ref, 'refs/tags') + uses: pypa/gh-action-pypi-publish@release/v1 + with: + password: ${{ secrets.PYPI_API_TOKEN }} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index e87c1e3..0000000 --- a/.travis.yml +++ /dev/null @@ -1,43 +0,0 @@ -language: python -cache: pip -sudo: false -env: -- MARSHMALLOW_VERSION="==3.0.0" -- MARSHMALLOW_VERSION="" -python: -- '3.6' -- '3.8' -before_install: -- travis_retry pip install codecov -install: -- travis_retry pip install -U . -- travis_retry pip install -U -r dev-requirements.txt -- travis_retry pip install -U --pre marshmallow"$MARSHMALLOW_VERSION" -before_script: -- flake8 flask_apispec -script: py.test -after_success: codecov -jobs: - include: - - stage: PyPI Release - if: tag IS present - python: "3.8" - env: [] - # Override install, and script to no-ops - before_install: true - install: - - travis_retry pip install -U . - - travis_retry pip install -r dev-requirements.txt - before_script: true - script: echo "Releasing to PyPI..." - after_success: true - before_deploy: invoke install - deploy: - provider: pypi - user: sloria - password: - secure: ONHrjS08OGOhuM9hANqwVa5UP0cqQSshLOyIadP/a6zE7N3FivzDUVKUmf1fjTWgSeorBLHLb8dWGcMvQrzfdzp965OLynCKHXrZ/3IcjKyUGNazNbfQExPmMc5znx4ZkKPSnC+15JWcHATwup1RwHOVrJ7jXr7agJEmciIUS00A9+SYxlDHMUyXBs9EaSIIr2su4H/+IfdRKwEXRcw6XIE7fY2FjiMT5mDlA76pwNHuFJEU7d0JAUtV7O97G+xoOvzLoVXztlnIoiBmMAAqrGl3RzzglmR/O9Oi1bR6mulDkb/0Ew50RqEOwkHZRsvURZp7o2PNBtfO6Msy4kBs5UaUAA+DtF02WrfBdcZ36H8HPdxlPo+ua1itroRx3jTV8q5vdIlwvN0E7SYO71mxyOP8qO0dpRSx7in/29vFvU30P+al2qVfODSKXk4Pu0xOWYAG6e3bxDsAHq61TSaBAP2ovp3C3CrW+00ilssPvdDjhMmeoESjn7rBNk4O97Il02jsu+HoCzkzs0QcWIKbEmGPpq+nf5LQjsA4Y3EHDmrZHPxY/V/AXq83WPrn0w4oSzqOK3kFAjmjavSnnSpX43h0ss05XwTL6z4RDTrZjIJiZoMgZU+XsDqDwqe1XKysU9JP4iRVAUeJV6YGYfCRM8yocKlNaYlG6GScvz6Yg7o= - on: - tags: true - distributions: "sdist bdist_wheel" - skip_cleanup: true From 4369f4ebde161fc2153ecab59e313f67ad20f820 Mon Sep 17 00:00:00 2001 From: Stu Fisher Date: Fri, 12 Aug 2022 09:00:17 +0200 Subject: [PATCH 2/6] fix yml --- .github/workflows/workflow.yml | 42 +++++++++++++++++----------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index d17cdb7..862d004 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -14,26 +14,26 @@ jobs: test: runs-on: ubuntu-latest - strategy: - matrix: - python-version: ["3.6", "3.7", "3.8", "3.9"] - steps: - - uses: actions/checkout@v3 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3 - with: - python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: | - pip install -r dev-requirements.txt - pip install . - - name: Run tests - run: | - pytest --cov flask_apispec --cov-report xml - - name: Coverage report - uses: codecov/codecov-action@v2 - with: - files: ./coverage.xml + strategy: + matrix: + python-version: ["3.6", "3.7", "3.8", "3.9"] + steps: + - uses: actions/checkout@v3 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v3 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + pip install -r dev-requirements.txt + pip install . + - name: Run tests + run: | + pytest --cov flask_apispec --cov-report xml + - name: Coverage report + uses: codecov/codecov-action@v2 + with: + files: ./coverage.xml build-n-publish: name: Build and publish Python 🐍 distributions 📦 to PyPI @@ -43,7 +43,7 @@ jobs: - name: Set up Python 3.10 uses: actions/setup-python@v3 with: - python-version: "3.10" + python-version: "3.9" - name: Install dependencies run: | pip install setuptools wheel invoke From f67fe64519e351ef37974722e78a18f1aacabe8d Mon Sep 17 00:00:00 2001 From: Stu Fisher Date: Fri, 12 Aug 2022 09:03:32 +0200 Subject: [PATCH 3/6] lint only src --- .github/workflows/workflow.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 862d004..0710fec 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -11,6 +11,7 @@ jobs: uses: actions/setup-python@v3 - name: Run flake8 uses: py-actions/flake8@v2 + path: flask_apispec test: runs-on: ubuntu-latest From 842a3644501e1031236623a22e60b7b9fdf36325 Mon Sep 17 00:00:00 2001 From: Stu Fisher Date: Fri, 12 Aug 2022 09:04:57 +0200 Subject: [PATCH 4/6] correct yml --- .github/workflows/workflow.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 0710fec..9d06063 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -11,7 +11,8 @@ jobs: uses: actions/setup-python@v3 - name: Run flake8 uses: py-actions/flake8@v2 - path: flask_apispec + with: + path: flask_apispec test: runs-on: ubuntu-latest From 32fa540f739d1c499a37e31282fd0900dcd564c2 Mon Sep 17 00:00:00 2001 From: Stu Fisher Date: Fri, 12 Aug 2022 09:14:23 +0200 Subject: [PATCH 5/6] only build if tests succeed --- .github/workflows/workflow.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 9d06063..a46fee9 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -40,6 +40,7 @@ jobs: build-n-publish: name: Build and publish Python 🐍 distributions 📦 to PyPI runs-on: ubuntu-latest + needs: [test] steps: - uses: actions/checkout@master - name: Set up Python 3.10 From b47b50e72e2614135896eaff8ad308a2b1b244f0 Mon Sep 17 00:00:00 2001 From: Stu Fisher Date: Fri, 12 Aug 2022 09:22:37 +0200 Subject: [PATCH 6/6] typo --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index a46fee9..963f4c7 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -43,7 +43,7 @@ jobs: needs: [test] steps: - uses: actions/checkout@master - - name: Set up Python 3.10 + - name: Set up Python 3.9 uses: actions/setup-python@v3 with: python-version: "3.9"