From 96fbb80be6cef4527f5ea5a074067e2a4dad7a3d Mon Sep 17 00:00:00 2001 From: repo-helper <74742576+repo-helper[bot]@users.noreply.github.com> Date: Sun, 22 Nov 2020 13:21:32 +0000 Subject: [PATCH 1/2] Updated files with 'repo_helper'. --- .github/actions_build_conda.sh | 26 ++++++++++++ .github/actions_deploy_conda.sh | 26 ++++++++++++ .github/workflows/python_ci_linux.yml | 2 +- .pre-commit-config.yaml | 4 +- README.rst | 2 +- repo_helper.yml | 1 - tox.ini | 60 +++++++++++++-------------- 7 files changed, 84 insertions(+), 37 deletions(-) create mode 100755 .github/actions_build_conda.sh create mode 100755 .github/actions_deploy_conda.sh diff --git a/.github/actions_build_conda.sh b/.github/actions_build_conda.sh new file mode 100755 index 0000000..bd025dc --- /dev/null +++ b/.github/actions_build_conda.sh @@ -0,0 +1,26 @@ +#!/bin/bash +# This file is managed by 'repo_helper'. Don't edit it directly. + +set -e -x + + python -m repo_helper make-recipe || exit 1 + + # Switch to miniconda + source "/home/runner/miniconda/etc/profile.d/conda.sh" + hash -r + conda activate base + conda config --set always_yes yes --set changeps1 no + conda update -q conda + conda install conda-build + conda install anaconda-client + conda info -a + + conda config --add channels domdfcoding || exit 1 + + conda config --add channels conda-forge || exit 1 + + conda build conda -c domdfcoding -c conda-forge --output-folder conda/dist --skip-existing + +fi + +exit 0 diff --git a/.github/actions_deploy_conda.sh b/.github/actions_deploy_conda.sh new file mode 100755 index 0000000..602e82c --- /dev/null +++ b/.github/actions_deploy_conda.sh @@ -0,0 +1,26 @@ +#!/bin/bash +# This file is managed by 'repo_helper'. Don't edit it directly. + +set -e -x + + # Switch to miniconda + source "/home/runner/miniconda/etc/profile.d/conda.sh" + hash -r + conda activate base + conda config --set always_yes yes --set changeps1 no + conda update -q conda + conda install anaconda-client + conda info -a + + for f in conda/dist/noarch/coverage_pyver_pragma-*.tar.bz2; do + [ -e "$f" ] || continue + echo "$f" + conda install "$f" || exit 1 + echo "Deploying to Anaconda.org..." + anaconda -t "$ANACONDA_TOKEN" upload "$f" || exit 1 + echo "Successfully deployed to Anaconda.org." + done + +fi + +exit 0 diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 11e4c91..0ef5157 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -76,7 +76,7 @@ jobs: shopt -s globstar python -m coverage combine coverage/**/.coverage - - name: "Upload Combined Coverage Aretfact" + - name: "Upload Combined Coverage Artefact" uses: actions/upload-artifact@v2 with: name: "combined-coverage" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0e7c666..d92be9b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -59,13 +59,13 @@ repos: - id: forbid-crlf - repo: https://github.com/domdfcoding/yapf-isort - rev: v0.5.2 + rev: v0.5.4 hooks: - id: yapf-isort exclude: ^(doc-source/conf|__pkginfo__|make_conda_recipe|setup)\.py$ - repo: https://github.com/domdfcoding/dep_checker - rev: v0.3.1 + rev: v0.4.1 hooks: - id: dep_checker args: diff --git a/README.rst b/README.rst index 181eab4..69eae45 100644 --- a/README.rst +++ b/README.rst @@ -37,7 +37,7 @@ coverage_pyver_pragma :alt: Docs Check Status .. |travis| image:: https://github.com/domdfcoding/coverage_pyver_pragma/workflows/Linux%20Tests/badge.svg - :target: https://github.com/domdfcoding/coverage_pyver_pragma/actions?query=workflow%3A%Linux+Tests%22 + :target: https://github.com/domdfcoding/coverage_pyver_pragma/actions?query=workflow%3A%22Linux+Tests%22 :alt: Linux Test Status .. |actions_windows| image:: https://github.com/domdfcoding/coverage_pyver_pragma/workflows/Windows%20Tests/badge.svg diff --git a/repo_helper.yml b/repo_helper.yml index 4c8b08b..0f962f8 100644 --- a/repo_helper.yml +++ b/repo_helper.yml @@ -23,7 +23,6 @@ python_versions: - "pypy3" # travis secure password for PyPI -travis_pypi_secure: "sGd114z7Kx0MLr1BtZXjE24a8SHUrPxNFSsLUcBtqqUU2xYYQDE9oDRnkmw1lJjW8pViT6TlDSP7e1kQ/3Oqwgi/lRTkrROeULRL2ZmKzsd4uPoEYzFk9Xuk4GWHP6kJspH53HnKcne2zk4Q0ORuSdRAI3VkkSdBtEgZG6k34Qx6j6VLm1Vombszns/uHm7+AWHUKlPKOfONTtKzuyUU4OVDfymSIANpnYLRAuJXRcIdmJuhAzEcCFWa1RCbtHQ2ACb/aSyI1YikNL8tGGPO/PRj8cxwMsfLr5KHfK/fKurvjVDT69/0VkB9E/zHmRLlZSBb/gaZfyyUsj9skkPI3brnDdve+3PFmd/X1fyCwkk7+jTakruHXtckEV9o/ubeRNEIvi3jY/V2jTTYh1sOlU6KLJ0xI45Aa7sRDTAvv0ldpR4LvoCbIL5p7gAgrhzmI0ibY3J+WtoVqIhTxddEFtVpYWgV0/Y1osv+QyS+DeiRzJ/E9NccuS658TIF8WjigEXupmAY7gytdf3IAKUMAJW7JbxjN+fnxhhyADPz+FdMrKDWI8N9+jXZkAHgS3qEYxRRwzpjXJrxkdXAIOhOUWl2Mu+eO7RD+O9S4WBZFADw/VmPV8BPv5nDhtJNYI+GN92eV4bg/bibDDelTChFIvYqGNsOZfLgTxxNicaezTU=" # directory that contains tests tests_dir: "tests" diff --git a/tox.ini b/tox.ini index 0c03ce1..445cdb1 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,6 @@ # This file is managed by 'repo_helper'. # You may add new sections, but any changes made to the following sections will be lost: -# * tox -# * envlists -# * travis # * gh-actions -# * testenv # * testenv:docs # * testenv:build # * testenv:lint @@ -17,25 +13,6 @@ # * check-wheel-contents # * pytest -[tox] -envlist = py36, py37, py38, py39, pypy3, mypy, build -skip_missing_interpreters = True -requires = pip>=20.2.1 -isolated_build = True - -[envlists] -test = py36, py37, py38, py39, pypy3 -qa = mypy, lint -cov = py36, coverage - -[travis] -python = - 3.6: py36, build, mypy - 3.7: py37, build - 3.8: py38, build - 3.9: py39, build - pypy3: pypy3, build - [gh-actions] python = 3.6: py36, build, mypy @@ -44,15 +21,6 @@ python = 3.9: py39, build pypy3: pypy3, build -[testenv] -setenv = - PIP_USE_FEATURE = 2020-resolver - PYTHONDEVMODE = 1 -deps = -r{toxinidir}/tests/requirements.txt -commands = - python --version - python -m pytest --cov=coverage_pyver_pragma -r aR tests/ {posargs} - [testenv:docs] setenv = SHOW_TODOS = 1 @@ -165,6 +133,34 @@ package = coverage_pyver_pragma addopts = --color yes --durations 25 timeout = 300 +[tox] +envlist = py36, py37, py38, py39, pypy3, mypy, build +skip_missing_interpreters = True +requires = pip>=20.2.1 +isolated_build = True + +[envlists] +test = py36, py37, py38, py39, pypy3 +qa = mypy, lint +cov = py36, coverage + +[travis] +python = + 3.6: py36, build, mypy + 3.7: py37, build + 3.8: py38, build + 3.9: py39, build + pypy3: pypy3, build + +[testenv] +setenv = + PIP_USE_FEATURE = 2020-resolver + PYTHONDEVMODE = 1 +deps = -r{toxinidir}/tests/requirements.txt +commands = + python --version + python -m pytest --cov=coverage_pyver_pragma -r aR tests/ {posargs} + [testenv:yapf] basepython = python3.7 changedir = {toxinidir} From 7252f0345ed26e135a54dedd4a55c132a78151d1 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Sun, 22 Nov 2020 19:41:12 +0000 Subject: [PATCH 2/2] Updated files with 'repo_helper'. --- tox.ini | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/tox.ini b/tox.ini index 445cdb1..c262083 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,9 @@ # This file is managed by 'repo_helper'. # You may add new sections, but any changes made to the following sections will be lost: +# * tox +# * envlists # * gh-actions +# * testenv # * testenv:docs # * testenv:build # * testenv:lint @@ -13,6 +16,17 @@ # * check-wheel-contents # * pytest +[tox] +envlist = py36, py37, py38, py39, pypy3, mypy, build +skip_missing_interpreters = True +requires = pip>=20.2.1 +isolated_build = True + +[envlists] +test = py36, py37, py38, py39, pypy3 +qa = mypy, lint +cov = py36, coverage + [gh-actions] python = 3.6: py36, build, mypy @@ -21,6 +35,15 @@ python = 3.9: py39, build pypy3: pypy3, build +[testenv] +setenv = + PIP_USE_FEATURE = 2020-resolver + PYTHONDEVMODE = 1 +deps = -r{toxinidir}/tests/requirements.txt +commands = + python --version + python -m pytest --cov=coverage_pyver_pragma -r aR tests/ {posargs} + [testenv:docs] setenv = SHOW_TODOS = 1 @@ -133,17 +156,6 @@ package = coverage_pyver_pragma addopts = --color yes --durations 25 timeout = 300 -[tox] -envlist = py36, py37, py38, py39, pypy3, mypy, build -skip_missing_interpreters = True -requires = pip>=20.2.1 -isolated_build = True - -[envlists] -test = py36, py37, py38, py39, pypy3 -qa = mypy, lint -cov = py36, coverage - [travis] python = 3.6: py36, build, mypy @@ -152,15 +164,6 @@ python = 3.9: py39, build pypy3: pypy3, build -[testenv] -setenv = - PIP_USE_FEATURE = 2020-resolver - PYTHONDEVMODE = 1 -deps = -r{toxinidir}/tests/requirements.txt -commands = - python --version - python -m pytest --cov=coverage_pyver_pragma -r aR tests/ {posargs} - [testenv:yapf] basepython = python3.7 changedir = {toxinidir}