Merge 6e1c0cd into bd8ced2

sphinx-toolbox · Nov 23, 2020 · 11bde83 · 11bde83
2 parents bd8ced2 + 6e1c0cd
commit 11bde83
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 20 deletions.
diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml
@@ -72,11 +72,11 @@ jobs:
         working-directory: coverage
 
       - name: Combine Coverage
-        run: |block_template.globals["make_actions_linux_shield"]
+        run: |
           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/.isort.cfg b/.isort.cfg
@@ -14,14 +14,14 @@ remove_redundant_aliases = True
 default_section = THIRDPARTY
 known_third_party =
     coverage
-    coverage-pyver-pragma
-    domdf-python-tools
+    coverage_pyver_pragma
+    domdf_python_tools
     github
     pytest
-    pytest-cov
-    pytest-randomly
-    pytest-timeout
+    pytest_cov
+    pytest_randomly
+    pytest_timeout
     requests
     sphinx
-    sphinx-toolbox
+    sphinx_toolbox
 known_first_party = sphinx_autofixture
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
@@ -35,7 +35,7 @@ sphinx-autofixture
 	:alt: Docs Check Status
 
 .. |travis| image:: https://github.com/domdfcoding/sphinx-autofixture/workflows/Linux%20Tests/badge.svg
-	:target: https://github.com/domdfcoding/sphinx-autofixture/actions?query=workflow%3A%Linux+Tests%22
+	:target: https://github.com/domdfcoding/sphinx-autofixture/actions?query=workflow%3A%22Linux+Tests%22
 	:alt: Linux Test Status
 
 .. |actions_windows| image:: https://github.com/domdfcoding/sphinx-autofixture/workflows/Windows%20Tests/badge.svg

diff --git a/repo_helper.yml b/repo_helper.yml
@@ -17,7 +17,6 @@ python_versions:
  - 3.8
  - 3.9
 
-travis_pypi_secure: "SI5A9t3XTMps5tVwIOd7SHz3zg0KQGJB6ZjK6i+xz30nkVCb8fLu4/mK3J4y6oJ7rlmL+wMeyqHCeryNpWtb9iJyGeEVG/e4pLhk/rF4okQHxKZ0bN6h+WjwF8zolrmalxDkMdNNrIrGhzkUZL+qZoiR80jgINmhUHfPlfqyuIql39sXLyNgPXitqCjUakMHzpYyCIJP9re1CBcen1u9mqQkxASf8LdHfDmr/K7+Y9o/iND5N2llkTNjnoPMHLwxWx4OojxvaXiTrGBmZ5XtlfPwDeGkXQ2S0QVORR7jJX3oQ8GDzIaFfTNiM8WyInKFUbfCyuO9+eyjNwt8FK+taqTv7z9b+fMxX1uUn9zMesIfgKCWtzSoEEPufss4cVo3PCDrpqOXvVlbgjrvQiYJHB/n5UMu1mFnQtyHC7RH0eIHSTS7l0KMlGZPDJbfeW8HBdXl0CzlvmLoVOV9hZ1DHX8WBYZh7abT36pyydx4WsNHr1tnxAJLE4WzA37tzef40zhSlbUJx6Plgt+r25JcxOsMm1dDutMB5SlSwiRR07ba7YQCpYNDdLLv3t0UGK0Tfvt02i0aTtxrBjm3zKbXS+xd06XTFRnI7iIzQflZeUV8AOGrfzB0CH1bIIOwW0eInxJ1aQM9uxPjrmxay2vrEH98T+cxGoRl0Q7XepnmvgY="
 
 sphinx_html_theme: furo
 

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,13 +27,6 @@ test = py36, py37, py38, py39
 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
-
 [gh-actions]
 python =
     3.6: py36, build, mypy
@@ -168,3 +160,10 @@ package = sphinx_autofixture
 [pytest]
 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