From 36662dd80944191de9c9127f0dd80e019aadf9ef Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Mon, 23 Nov 2020 16:33:04 +0000 Subject: [PATCH] Updated files with 'repo_helper'. --- .ci/actions_build_conda.sh | 26 ---------------- .ci/actions_deploy_conda.sh | 26 ---------------- .ci/travis_deploy_conda.sh | 45 --------------------------- .github/actions_build_conda.sh | 24 ++++++++++++++ .github/actions_deploy_conda.sh | 24 ++++++++++++++ .github/workflows/cleanup.yml | 14 +++++++++ .github/workflows/python_ci_linux.yml | 10 +++--- .isort.cfg | 32 +++++++++---------- .pre-commit-config.yaml | 4 +-- README.rst | 2 +- doc-source/requirements.txt | 2 +- repo_helper.yml | 3 -- setup.cfg | 2 +- tox.ini | 19 +++++------ 14 files changed, 96 insertions(+), 137 deletions(-) delete mode 100755 .ci/actions_build_conda.sh delete mode 100755 .ci/actions_deploy_conda.sh delete mode 100755 .ci/travis_deploy_conda.sh create mode 100755 .github/actions_build_conda.sh create mode 100755 .github/actions_deploy_conda.sh create mode 100644 .github/workflows/cleanup.yml diff --git a/.ci/actions_build_conda.sh b/.ci/actions_build_conda.sh deleted file mode 100755 index bd025dc..0000000 --- a/.ci/actions_build_conda.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/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/.ci/actions_deploy_conda.sh b/.ci/actions_deploy_conda.sh deleted file mode 100755 index e33834a..0000000 --- a/.ci/actions_deploy_conda.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/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/enum_tools-*.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/.ci/travis_deploy_conda.sh b/.ci/travis_deploy_conda.sh deleted file mode 100755 index ce091ed..0000000 --- a/.ci/travis_deploy_conda.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash -# This file is managed by 'repo_helper'. Don't edit it directly. - -set -e -x - -if [ "$TRAVIS_PYTHON_VERSION" == 3.6 ]; then - if [ -z "$TRAVIS_TAG" ] && [ "$TRAVIS_COMMIT_MESSAGE" == "Bump version*" ]; then - echo "Deferring building conda package because this is release" - else - - python3 -m pip install repo_helper || exit 1 - python3 -m repo_helper make-recipe || exit 1 - - # Switch to miniconda - source "/home/travis/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 - - for f in conda/dist/noarch/enum_tools-*.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 - -else - echo "Skipping deploying conda package because this is not the required runtime" -fi - -exit 0 diff --git a/.github/actions_build_conda.sh b/.github/actions_build_conda.sh new file mode 100755 index 0000000..ea36ff2 --- /dev/null +++ b/.github/actions_build_conda.sh @@ -0,0 +1,24 @@ +#!/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 + +exit 0 diff --git a/.github/actions_deploy_conda.sh b/.github/actions_deploy_conda.sh new file mode 100755 index 0000000..0724264 --- /dev/null +++ b/.github/actions_deploy_conda.sh @@ -0,0 +1,24 @@ +#!/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/enum_tools-*.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 + +exit 0 diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml new file mode 100644 index 0000000..741c0bd --- /dev/null +++ b/.github/workflows/cleanup.yml @@ -0,0 +1,14 @@ +# This file is managed by 'repo_helper'. Don't edit it directly. +--- +name: Artefact Cleaner +on: + schedule: + - cron: 0 9 1 * * +jobs: + Clean: + runs-on: ubuntu-latest + steps: + - name: cleanup + uses: glassechidna/artifact-cleaner@v2 + with: + minimumAge: 1000000.0 diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 825484c..8b279b9 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" @@ -143,13 +143,13 @@ jobs: - name: Build Conda 📦 run: | - chmod +x .ci/actions_build_conda.sh - bash .ci/actions_build_conda.sh + chmod +x .github/actions_build_conda.sh + bash .github/actions_build_conda.sh - name: Deploy Conda 🚀 if: startsWith(github.ref, 'refs/tags/') run: | - chmod +x .ci/actions_deploy_conda.sh - bash .ci/actions_deploy_conda.sh + chmod +x .github/actions_deploy_conda.sh + bash .github/actions_deploy_conda.sh env: ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }} diff --git a/.isort.cfg b/.isort.cfg index 750dd20..4968a61 100644 --- a/.isort.cfg +++ b/.isort.cfg @@ -18,28 +18,28 @@ known_third_party = beautifulsoup4 bs4 coverage - coverage-pyver-pragma - domdf-python-tools - extras-require + coverage_pyver_pragma + domdf_python_tools + extras_require github html5lib pygments pytest - pytest-cov - pytest-randomly - pytest-regressions - pytest-rerunfailures - pytest-timeout + pytest_cov + pytest_randomly + pytest_regressions + pytest_rerunfailures + pytest_timeout requests sphinx - sphinx-autodoc-typehints - sphinx-notfound-page - sphinx-prompt - sphinx-rtd-theme - sphinx-tabs - sphinx-toolbox - sphinxcontrib-httpdomain + sphinx_autodoc_typehints + sphinx_notfound_page + sphinx_prompt + sphinx_rtd_theme + sphinx_tabs + sphinx_toolbox + sphinxcontrib_httpdomain sphinxemoji - typing-extensions + typing_extensions known_first_party = enum_tools remove_redundant_aliases = True diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2e04b98..326dacc 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 b534104..7982b6a 100644 --- a/README.rst +++ b/README.rst @@ -37,7 +37,7 @@ Enum Tools :alt: Docs Check Status .. |travis| image:: https://github.com/domdfcoding/enum_tools/workflows/Linux%20Tests/badge.svg - :target: https://github.com/domdfcoding/enum_tools/actions?query=workflow%3A%Linux+Tests%22 + :target: https://github.com/domdfcoding/enum_tools/actions?query=workflow%3A%22Linux+Tests%22 :alt: Linux Test Status .. |actions_windows| image:: https://github.com/domdfcoding/enum_tools/workflows/Windows%20Tests/badge.svg diff --git a/doc-source/requirements.txt b/doc-source/requirements.txt index d76884e..d272f63 100644 --- a/doc-source/requirements.txt +++ b/doc-source/requirements.txt @@ -8,7 +8,7 @@ sphinx-copybutton>=0.2.12 sphinx-notfound-page>=0.5 sphinx-prompt>=1.1.0 sphinx-tabs>=1.1.13 -sphinx-toolbox>=1.7.3 +sphinx-toolbox>=1.7.5 sphinxcontrib-httpdomain>=1.7.0 sphinxemoji>=0.1.6 toctree-plus>=0.0.4 diff --git a/repo_helper.yml b/repo_helper.yml index d5e509a..f2165a5 100644 --- a/repo_helper.yml +++ b/repo_helper.yml @@ -21,7 +21,6 @@ python_versions: - "3.9-dev" # travis secure password for PyPI -travis_pypi_secure: "ccXgmg5Goemg2IFrw1F62mtnVmVVPpEVPCrPhAfuW4uEh9MgfluULgFjOZUaur9frgTwlFuXjv7Uyz66+IBH4m+W8z6vKaBq260fi+6Dues+BgyOvVvDmPm1+pE7rVxSWzDJgfEiRJjGo0CjrVmqvFIyamwJqojkR3AcNRtRZFFaH0P5gA1EcAQrfngn4IK6lxgYd0b6CrwZodyr/o7xDMpqikKcYJAiXLtQp7CFeo/NfRWIgzfhvquxpA81AZbeyVL4cciDLsmQHqib6yhHb8sGDGCo9tCUB0oWf7tFbS/diIFYqumqbdumxTl8p7u4NL7XJc6F8ySTQ0RsHk1/3U7z5hSGQDbhAsGdsBeEf4iM22M1CqJ8raFcZXaeF2DLqFdTHovsG0BNG5VWNsrgn2G+S60wPgiQQBZKtNrvIOVu1QGCCUdBUO1cpnrIk4g8ZB7P12uHDWVWUDF1xYhji/F1JEIZ1eVgmVWPKBbGe+n6WfQIxfRPy++xyNU2F0C4UnapkR894UW8LDfAFS1K5cZluco8ZYj0AQgR5mdQkCCfcWCIgabtTyrsPum2sFFFbQyWJ7ZEfUPX7cfu5qKJ4TmOFZGTEp7ii+jYhaSGfpsayV4wxIJD55n0RhsxcNk908dXKn78AWBVVjHqdfWKnCKF0Lc26G0g9OoNeRp74II=" # additional lines for MANIFEST.in manifest_additional: @@ -61,5 +60,3 @@ extra_sphinx_extensions: sphinx_conf_epilogue: - html_logo = "../enum_tools.png" - -use_travis: false diff --git a/setup.cfg b/setup.cfg index aba8c9f..fff1996 100644 --- a/setup.cfg +++ b/setup.cfg @@ -43,9 +43,9 @@ packages = find: [options.packages.find] exclude = + doc-source tests tests.* - doc-source [mypy] python_version = 3.6 diff --git a/tox.ini b/tox.ini index 671d964..cb739dc 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,6 @@ # You may add new sections, but any changes made to the following sections will be lost: # * tox # * envlists -# * travis # * gh-actions # * testenv # * testenv:docs @@ -28,13 +27,6 @@ test = py36, py37, py38, py39-dev qa = mypy, lint cov = py36, coverage -[travis] -python = - 3.6: py36, build, mypy - 3.7: py37, build - 3.8: py38, build - 3.9-dev: py39-dev, build - [gh-actions] python = 3.6: py36, build, mypy @@ -53,9 +45,7 @@ commands = python -m pytest --cov=enum_tools -r aR tests/ {posargs} [testenv:docs] -setenv = - SHOW_TODOS = 1 - PIP_USE_FEATURE = 2020-resolver +setenv = SHOW_TODOS = 1 basepython = python3.8 changedir = {toxinidir}/doc-source extras = all @@ -172,6 +162,13 @@ package = enum_tools addopts = --color yes --durations 25 timeout = 300 +[travis] +python = + 3.6: py36, build, mypy + 3.7: py37, build + 3.8: py38, build + 3.9-dev: py39-dev, build + [testenv:yapf] basepython = python3.7 changedir = {toxinidir}