From 4b6f0d6a971c417e8aeb1db4291ec0c2c9391acf Mon Sep 17 00:00:00 2001 From: "Alan D. Tse" Date: Sat, 13 Feb 2021 14:26:32 -0800 Subject: [PATCH 1/6] ci: add push to dev after release --- .github/workflows/semantic_release.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/semantic_release.yml b/.github/workflows/semantic_release.yml index f8493887..db0aea9f 100644 --- a/.github/workflows/semantic_release.yml +++ b/.github/workflows/semantic_release.yml @@ -32,3 +32,8 @@ jobs: PYPI_USERNAME: __token__ run: | DEBUG='*' semantic-release publish + - name: Push changes to dev + uses: ad-m/github-push-action@master + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + branch: dev \ No newline at end of file From 12870297c0c32278f19834ce3ac826c3f11bf92a Mon Sep 17 00:00:00 2001 From: "Alan D. Tse" Date: Sat, 13 Feb 2021 14:30:22 -0800 Subject: [PATCH 2/6] ci: set timeout for tests --- .github/workflows/python_package.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/python_package.yaml b/.github/workflows/python_package.yaml index 22725123..c7bc8f3f 100644 --- a/.github/workflows/python_package.yaml +++ b/.github/workflows/python_package.yaml @@ -13,6 +13,7 @@ jobs: build: runs-on: ubuntu-latest + timeout-minutes: 15 strategy: matrix: python-version: [3.7, 3.8] From c47f17a41a70e66d52a48f34d7c9b951e8441185 Mon Sep 17 00:00:00 2001 From: "Alan D. Tse" Date: Sat, 13 Feb 2021 14:30:59 -0800 Subject: [PATCH 3/6] ci: change pipenv install step --- .github/workflows/python_package.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python_package.yaml b/.github/workflows/python_package.yaml index c7bc8f3f..bf45db69 100644 --- a/.github/workflows/python_package.yaml +++ b/.github/workflows/python_package.yaml @@ -28,7 +28,7 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install pipenv - pipenv install -e . --dev + pipenv install --three --dev - name: Lint run: | make lint From 97b677e5149ec296793c120dc84680f53b34d3ee Mon Sep 17 00:00:00 2001 From: "Alan D. Tse" Date: Sat, 13 Feb 2021 14:32:24 -0800 Subject: [PATCH 4/6] ci: rename test workflow --- .github/workflows/{python_package.yaml => test_and_lint.yaml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{python_package.yaml => test_and_lint.yaml} (97%) diff --git a/.github/workflows/python_package.yaml b/.github/workflows/test_and_lint.yaml similarity index 97% rename from .github/workflows/python_package.yaml rename to .github/workflows/test_and_lint.yaml index bf45db69..f15341dd 100644 --- a/.github/workflows/python_package.yaml +++ b/.github/workflows/test_and_lint.yaml @@ -1,7 +1,7 @@ # This workflow will install Python dependencies, run tests and lint with a variety of Python versions # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions -name: Python package +name: Lint and test on: push: From 2a6635fb3822f04ba3e9b8ad84b0e01f2a2eae32 Mon Sep 17 00:00:00 2001 From: "Alan D. Tse" Date: Sat, 13 Feb 2021 14:35:07 -0800 Subject: [PATCH 5/6] fix: bump authcaptureproxy --- .github/workflows/semantic_release.yml | 2 +- Pipfile.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/semantic_release.yml b/.github/workflows/semantic_release.yml index db0aea9f..d45650eb 100644 --- a/.github/workflows/semantic_release.yml +++ b/.github/workflows/semantic_release.yml @@ -36,4 +36,4 @@ jobs: uses: ad-m/github-push-action@master with: github_token: ${{ secrets.GITHUB_TOKEN }} - branch: dev \ No newline at end of file + branch: dev diff --git a/Pipfile.lock b/Pipfile.lock index 96000652..9e36435d 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -73,10 +73,10 @@ }, "authcaptureproxy": { "hashes": [ - "sha256:66193ee617e0a8cab51424e739c6cd90a4debf9f4d334feeb4d11d486b2b08ea", - "sha256:7ea2c63777b476e8fcdb9a710e31b06427f9aec2a26c986c41bc4c2684d96319" + "sha256:55a7b26fe8ff5a59a37a951e5bfdf415ac48e6fdaff3fa7626981fe82730e5ea", + "sha256:95da6802d12762be3ce94fe0f850d19657cf880bbe61dc23887178d279de696e" ], - "version": "==0.4.0" + "version": "==0.4.1" }, "backoff": { "hashes": [ @@ -370,7 +370,7 @@ "sha256:fbb17c0d0822684b7d6c09915677a32319f16ff1115df5ec05bdcaaee40b35f3", "sha256:fff1f3a586246110f34dc762098b5afd2de88de507559e63553d7da643053786" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4.0'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'", "version": "==5.4" }, "detox": { @@ -501,7 +501,7 @@ "sha256:c729845434366216d320e936b8ad6f9d681aab72dc7cbc2d51bedc3582f3ad1e", "sha256:fff4f0c04e1825522ce6949973e83110a6e907750cd92d128b0d14aaaadbffdc" ], - "markers": "python_version >= '3.6' and python_version < '4.0'", + "markers": "python_version >= '3.6' and python_version < '4'", "version": "==5.7.0" }, "keyring": { @@ -870,7 +870,7 @@ "sha256:1b465e494e3e0d8939b50680403e3aedaa2bc434b7d5af64dfd3c958d7f5ae80", "sha256:de3eedaad74a2683334e282005cd8d7f22f4d55fa690a2a1020a416cb0a47e73" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4.0'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'", "version": "==1.26.3" }, "virtualenv": { From 8d3565bb250d7f35cea0c9d7ec64f41cbb878ad9 Mon Sep 17 00:00:00 2001 From: "Alan D. Tse" Date: Sat, 13 Feb 2021 15:10:35 -0800 Subject: [PATCH 6/6] ci: add typing_extensions --- Pipfile | 1 + Pipfile.lock | 18 +----------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/Pipfile b/Pipfile index 3218d940..d42dd366 100644 --- a/Pipfile +++ b/Pipfile @@ -15,6 +15,7 @@ tox = "*" tox-pipenv = "*" twine = "*" black = "*" +typing-extensions = "*" [packages] aiohttp = "*" diff --git a/Pipfile.lock b/Pipfile.lock index 9e36435d..2db902ab 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "46472251f081593b8d0048247c252e0afe84743d97d2a64dc026270ca3263b89" + "sha256": "b1eb06e65e0b30739dcebe12d69cd5606e384d2ccd079ee72356e9c9cd74f032" }, "pipfile-spec": 6, "requires": {}, @@ -481,14 +481,6 @@ "markers": "python_version >= '3.4'", "version": "==3.1" }, - "importlib-metadata": { - "hashes": [ - "sha256:ace61d5fc652dc280e7b6b4ff732a9c2d40db2c0f92bc6cb74e07b73d53a1771", - "sha256:fa5daa4477a7414ae34e95942e4dd07f62adf589143c875c133c1e53c4eff38d" - ], - "markers": "python_version >= '3.6'", - "version": "==3.4.0" - }, "iniconfig": { "hashes": [ "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3", @@ -901,14 +893,6 @@ "sha256:b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7" ], "version": "==1.12.1" - }, - "zipp": { - "hashes": [ - "sha256:102c24ef8f171fd729d46599845e95c7ab894a4cf45f5de11a44cc7444fb1108", - "sha256:ed5eee1974372595f9e416cc7bbeeb12335201d8081ca8a0743c954d4446e5cb" - ], - "markers": "python_version >= '3.6'", - "version": "==3.4.0" } } }