Updated files with 'repo_helper'.

python-formate · Nov 23, 2020 · d39cdd9 · d39cdd9
1 parent 2a811d0
commit d39cdd9
Show file tree

Hide file tree

Showing 13 changed files with 89 additions and 83 deletions.
diff --git a/.ci/actions_build_conda.sh b/.ci/actions_build_conda.sh
diff --git a/.ci/actions_deploy_conda.sh b/.ci/actions_deploy_conda.sh
diff --git a/.github/actions_build_conda.sh 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
@@ -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/flake8-dunder-all-*.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
@@ -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
@@ -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
@@ -18,15 +18,15 @@ known_third_party =
     click
     consolekit
     coverage
-    coverage-pyver-pragma
-    domdf-python-tools
+    coverage_pyver_pragma
+    domdf_python_tools
     flake8
     github
     pytest
-    pytest-cov
-    pytest-randomly
-    pytest-rerunfailures
-    pytest-timeout
+    pytest_cov
+    pytest_randomly
+    pytest_rerunfailures
+    pytest_timeout
     requests
 known_first_party = flake8_dunder_all
 remove_redundant_aliases = True
diff --git 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
@@ -37,7 +37,7 @@ flake8-dunder-all
 	:alt: Docs Check Status
 
 .. |travis| image:: https://github.com/domdfcoding/flake8-dunder-all/workflows/Linux%20Tests/badge.svg
-	:target: https://github.com/domdfcoding/flake8-dunder-all/actions?query=workflow%3A%Linux+Tests%22
+	:target: https://github.com/domdfcoding/flake8-dunder-all/actions?query=workflow%3A%22Linux+Tests%22
 	:alt: Linux Test Status
 
 .. |actions_windows| image:: https://github.com/domdfcoding/flake8-dunder-all/workflows/Windows%20Tests/badge.svg

diff --git a/doc-source/requirements.txt b/doc-source/requirements.txt
@@ -10,7 +10,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
 tabulate>=0.8.7

diff --git a/repo_helper.yml b/repo_helper.yml
@@ -24,7 +24,6 @@ python_versions:
  - "pypy3"
 
 # travis secure password for PyPI
-travis_pypi_secure: "fP5pFqWlcDvPsgEwnp0gpamm2ZFf6VAWvX0ppgimcKGMIvKy3CJ4r3B4saAbi9dzTvM4yRZt0As5oky5XLPA3kQC2py5BtUxw9qiiX/XfmKQJtd+f4IGa65dKtRVyIp78PZdVy/m7g+p+NTKnJ0na0JgrDGQWCKhmbE5n834FQsUCaXrCcTHzv9RyVtNcwvhi2pPvKsLrr+/+YWLYtg6FhZXECOfCzrFmoeYG/p4fpwZpE8jBW5ISL42GAPa9BXIdQF5PpbxZAEbZc/x/nzgx7ttyzc+l/Y8O6EF66FenqfT/RWP1L2fjhxrH0itMSrDIdqJq/Csw/yNyb6xln6LvfJOoNe5BJ9B4yOaOw3zMnbObPwjJdcBzCMMD0E6N6HWUEZsHvbzT1e8Imix1GmLCemqazQSLSlKziin3aj2DM6vm8KnSYkigv7XS3b9lTPR8TfJrkz91zUOFhHIifiaN07ZcWtwhEp1VFXFnJS18VifsdaYJU4S5ZoNZXwy8mn+5xCaQcNuBOM84pP4smR1Dboglv9uHBl1eth7CnX6XNEPsEVT+MO0wQb6MoAf9n37Z3mUPMu3hD4WTeD/Of/t4tRAmzomosof/9RcvOBHXBu6Fh88I3A4UtKwpzQqcBC2nAm/wmqLmfWvVvd/OtEtYMpoglvDLqBzzFB4jmv8c2Q="
 
 classifiers:
  - 'Development Status :: 4 - Beta'

diff --git a/setup.cfg b/setup.cfg
@@ -28,11 +28,11 @@ classifiers =
     Operating System :: OS Independent
     Programming Language :: Python
     Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
     Programming Language :: Python :: Implementation :: CPython
     Programming Language :: Python :: Implementation :: PyPy
     Topic :: Utilities
@@ -46,9 +46,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
@@ -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,15 +27,6 @@ test = py36, py37, py38, py39, py310-dev, 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
-    3.10-dev: py310-dev, build
-    pypy3: pypy3, build
-
 [gh-actions]
 python =
     3.6: py36, build, mypy
@@ -56,9 +46,7 @@ commands =
     python -m pytest --cov=flake8_dunder_all -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
 deps =
@@ -172,6 +160,15 @@ package = flake8_dunder_all
 addopts = --color yes --durations 25
 timeout = 300
 
+[travis]
+python =
+    3.6: py36, build, mypy
+    3.7: py37, build
+    3.8: py38, build
+    3.9: py39, build
+    3.10-dev: py310-dev, build
+    pypy3: pypy3, build
+
 [testenv:yapf]
 basepython = python3.7
 changedir = {toxinidir}