Merge 7884a7a into 66b8e42

sphinx-toolbox · Nov 23, 2020 · 8e71387 · 8e71387
2 parents 66b8e42 + 7884a7a
commit 8e71387
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 59 deletions.
diff --git a/.github/actions_build_conda.sh b/.github/actions_build_conda.sh
@@ -3,24 +3,22 @@
 
 set -e -x
 
-  python -m repo_helper make-recipe || exit 1
+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
+# 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 domdfcoding || exit 1
 
-  conda config --add channels conda-forge || 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
+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
@@ -3,24 +3,22 @@
 
 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
+# 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/sphinx-toolbox-*.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
+for f in conda/dist/noarch/sphinx-toolbox-*.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,31 +18,31 @@ known_third_party =
     beautifulsoup4
     consolekit
     coverage
-    coverage-pyver-pragma
+    coverage_pyver_pragma
     docutils
-    docutils-stubs
-    domdf-python-tools
-    flake8-dunder-all
+    docutils_stubs
+    domdf_python_tools
+    flake8_dunder_all
     github
     html5lib
     hypothesis
-    importlib-resources
+    importlib_resources
     pprint36
     pytest
-    pytest-cov
-    pytest-httpserver
-    pytest-randomly
-    pytest-regressions
-    pytest-rerunfailures
-    pytest-timeout
+    pytest_cov
+    pytest_httpserver
+    pytest_randomly
+    pytest_regressions
+    pytest_rerunfailures
+    pytest_timeout
     requests
-    ruamel-yaml
+    ruamel_yaml
     sphinx
-    sphinx-autodoc-typehints
-    sphinx-prompt
-    sphinx-tabs
+    sphinx_autodoc_typehints
+    sphinx_prompt
+    sphinx_tabs
     sphobjinv
     tabulate
-    typing-extensions
-    typing-inspect
+    typing_extensions
+    typing_inspect
 known_first_party = sphinx_toolbox
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -59,7 +59,7 @@ 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$

diff --git a/tox.ini b/tox.ini
@@ -45,9 +45,7 @@ commands =
     python -m pytest --cov=sphinx_toolbox -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