diff options
| author | Justin Mayer <entroP@gmail.com> | 2022-10-24 18:00:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-24 18:00:17 -0700 |
| commit | 66408d611fd6122cfdba19e7a865789ce6e8bdbc (patch) | |
| tree | db1eb71238620d25af938cd614f4b12f110a3c4a | |
| parent | 2a7e691000db4b69b1b4c960141f7c00eff5f06d (diff) | |
| parent | cdc90d5d07691e5d7d35c81badd0d27074f8451c (diff) | |
| download | pelican-66408d611fd6122cfdba19e7a865789ce6e8bdbc.tar.gz | |
Merge pull request #3051 from avaris/gh-actions-update
| -rw-r--r-- | .github/workflows/main.yml | 39 | ||||
| -rw-r--r-- | requirements/style.pip | 2 | ||||
| -rw-r--r-- | tox.ini | 5 |
3 files changed, 24 insertions, 22 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 50a8714c..c4f10faa 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,13 +29,13 @@ jobs: python: "3.7" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup Python ${{ matrix.config.python }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.config.python }} - name: Set up Pip cache (Linux) - uses: actions/cache@v2 + uses: actions/cache@v3 if: startsWith(runner.os, 'Linux') with: path: ~/.cache/pip @@ -43,7 +43,7 @@ jobs: restore-keys: | ${{ runner.os }}-pip- - name: Set up Pip cache (macOS) - uses: actions/cache@v2 + uses: actions/cache@v3 if: startsWith(runner.os, 'macOS') with: path: ~/Library/Caches/pip @@ -51,7 +51,7 @@ jobs: restore-keys: | ${{ runner.os }}-pip- - name: Setup pip cache (Windows) - uses: actions/cache@v2 + uses: actions/cache@v3 if: startsWith(runner.os, 'Windows') with: path: ~\AppData\Local\pip\Cache @@ -62,7 +62,7 @@ jobs: if: startsWith(runner.os, 'Linux') run: sudo locale-gen fr_FR.UTF-8 tr_TR.UTF-8 - name: Install pandoc - uses: r-lib/actions/setup-pandoc@v1 + uses: r-lib/actions/setup-pandoc@v2 with: pandoc-version: "2.9.2" - name: Install tox @@ -82,13 +82,13 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: - python-version: "3.7" + python-version: "3.9" - name: Set pip cache (Linux) - uses: actions/cache@v2 + uses: actions/cache@v3 if: startsWith(runner.os, 'Linux') with: path: ~/.cache/pip @@ -106,13 +106,13 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: - python-version: "3.7" + python-version: "3.9" - name: Set pip cache (Linux) - uses: actions/cache@v2 + uses: actions/cache@v3 if: startsWith(runner.os, 'Linux') with: path: ~/.cache/pip @@ -132,11 +132,11 @@ jobs: if: ${{ github.ref=='refs/heads/master' && github.event_name!='pull_request' }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: - python-version: "3.7" + python-version: "3.9" - name: Check release id: check_release run: | @@ -144,9 +144,10 @@ jobs: pip install poetry pip install githubrelease pip install --pre autopub - echo "##[set-output name=release;]$(autopub check)" + autopub check + continue-on-error: true - name: Publish - if: ${{ steps.check_release.outputs.release=='' }} + if: steps.check_release.outcome=='success' env: GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} diff --git a/requirements/style.pip b/requirements/style.pip index fe4c25c4..90225d01 100644 --- a/requirements/style.pip +++ b/requirements/style.pip @@ -1,2 +1,2 @@ -flake8<4.0 +flake8 flake8-import-order @@ -17,7 +17,7 @@ commands = pytest -s --cov=pelican pelican [testenv:docs] -basepython = python3.7 +basepython = python3.9 deps = -rrequirements/docs.pip changedir = docs @@ -36,7 +36,8 @@ import-order-style = cryptography max-line-length = 88 [testenv:flake8] -basepython = python3.7 +basepython = python3.9 +skip_install = true deps = -rrequirements/style.pip commands = |