Updated config files, pre-commit hooks and travis config.

repo-helper · Nov 13, 2020 · d958bb8 · d958bb8
1 parent 897ef47
commit d958bb8
Show file tree

Hide file tree

Showing 25 changed files with 45 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,7 @@
 # This file is managed by 'repo_helper'. Don't edit it directly.
 ---
 
+os: linux
 language: python
 dist: focal
 cache: pip
@@ -57,7 +58,7 @@ jobs:
           tags: true
           repo: domdfcoding/repo_helper
         provider: pypi
-        user: "DomDF"
+        username: "DomDF"
         password:
           secure: aB17VofHqBsFpQFeEvXov5FuQh4bKtuZ4w3pUqfNS472bJJJcYXefog3sEYRZRxnmltxJv8OA8qp7ZvH4pjtQ0w4S9J96vm/5aTySBkIkJrCQK5OCHgCAqwM2Im0QbB34ih2hHDdJ7b65j2HcEvfj9k3OsUueRy1UKelPYPwB3gJLfZXJtXqrwF9vDbj8a245DgOGEhIeD2f6kMH9ETE8sZvi8hJgZjmhDY613ToXAZBFJgcjn4zE3GHBHSpipaQCtwGtxiWwfTfDrZqpgQcgv/eKEybKTavto5txBnSCFFZe5LUb2na3RJwktN9DWoy3C9RIRtHHcaxFQAGR8zCTtSHk5oLQVwrKOOmezKk4+DynupbfDkY94MSDK9NqJu/fYHY3qft5fKGH0a9zqIX6MEG8HFlI217DOIySpyEoApatDUu+6TGqwt/FbSOADOjNNWz72ihF6EtFcdHHon8RV7gx+k513802cdU18YlhlCLoRiH/N2ZL5nOreG0m+kZ9beZTRxL+ITxh0WeKIBSBUPfAp/6ZtmKztlOGaZpEbpxTM1aTI0hLOJ5pk/hxJFRPZseFhVV0d974XxnaSFzmPKz5jUNjCafU3JVry1Ac0B1/AHs9/zZy8mwCIsRmM3gTkVG0U3lBAv7JRpPMZVGRJMYI7fjJ1YkIY/CiYf2SvA=
         distributions: "sdist bdist_wheel"

diff --git a/repo_helper/configuration/conda_anaconda.py b/repo_helper/configuration/conda_anaconda.py
@@ -84,6 +84,8 @@ class conda_extras(ConfigVar):  # noqa
 		conda_extras:
 		  - plotting
 		  - xml
+
+	.. versionadded:: 2020.11.12
 	"""
 
 	dtype = List[str]

diff --git a/repo_helper/files/pre_commit.py b/repo_helper/files/pre_commit.py
@@ -150,6 +150,7 @@ def to_dict(self) -> MutableMapping[str, Union[str, List[Hook]]]:
 		hooks=[
 				"check-added-large-files",
 				"check-ast",
+				"fix-byte-order-marker",
 				"check-byte-order-marker",
 				"check-case-conflict",
 				"check-executables-have-shebangs",
@@ -160,9 +161,10 @@ def to_dict(self) -> MutableMapping[str, Union[str, List[Hook]]]:
 				"check-symlinks",
 				"check-vcs-permalinks",
 				"detect-private-key",
-				"end-of-file-fixer",
 				"trailing-whitespace",
 				"mixed-line-ending",
+				"end-of-file-fixer",
+				{"id": "name-tests-test", "args": ['--django']},
 				]
 		)
 

diff --git a/repo_helper/templates/travis.yml b/repo_helper/templates/travis.yml
@@ -1,6 +1,7 @@
 # {{ managed_message }}
 ---
 
+os: linux
 language: python
 dist: {{ travis_ubuntu_version }}
 cache: pip
@@ -51,7 +52,7 @@ jobs:
           tags: true
           repo: {{ username }}/{{ repo_name }}
         provider: pypi
-        user: "DomDF"
+        username: "DomDF"
         password:
           secure: {{ travis_pypi_secure }}
         distributions: "sdist bdist_wheel"

diff --git a/repo_helper/templates/travis_not_pure_python.yml b/repo_helper/templates/travis_not_pure_python.yml
@@ -1,6 +1,7 @@
 # {{ managed_message }}
 ---
 
+os: linux
 language: python
 dist: {{ travis_ubuntu_version }}
 cache: pip

diff --git a/tests/test_files/test_ci_cd_/test_make_travis_case_1.yml b/tests/test_files/test_ci_cd_/test_make_travis_case_1.yml
@@ -1,6 +1,7 @@
 # This file is managed by 'repo_helper'. Don't edit it directly.
 ---
 
+os: linux
 language: python
 dist: xenial
 cache: pip
@@ -48,7 +49,7 @@ jobs:
           tags: true
           repo: octocat/hello-world
         provider: pypi
-        user: "DomDF"
+        username: "DomDF"
         password:
           secure: 1234abcd
         distributions: "sdist bdist_wheel"

diff --git a/tests/test_files/test_ci_cd_/test_make_travis_case_2.yml b/tests/test_files/test_ci_cd_/test_make_travis_case_2.yml
@@ -1,6 +1,7 @@
 # This file is managed by 'repo_helper'. Don't edit it directly.
 ---
 
+os: linux
 language: python
 dist: bionic
 cache: pip
@@ -48,7 +49,7 @@ jobs:
           tags: true
           repo: octocat/hello-world
         provider: pypi
-        user: "DomDF"
+        username: "DomDF"
         password:
           secure: 1234abcd
         distributions: "sdist bdist_wheel"

diff --git a/tests/test_files/test_ci_cd_/test_make_travis_case_3_False_False_False_False_.yml b/tests/test_files/test_ci_cd_/test_make_travis_case_3_False_False_False_False_.yml
@@ -1,6 +1,7 @@
 # This file is managed by 'repo_helper'. Don't edit it directly.
 ---
 
+os: linux
 language: python
 dist: xenial
 cache: pip

diff --git a/tests/test_files/test_ci_cd_/test_make_travis_case_3_False_False_False_True_.yml b/tests/test_files/test_ci_cd_/test_make_travis_case_3_False_False_False_True_.yml
@@ -1,6 +1,7 @@
 # This file is managed by 'repo_helper'. Don't edit it directly.
 ---
 
+os: linux
 language: python
 dist: xenial
 cache: pip
@@ -46,7 +47,7 @@ jobs:
           tags: true
           repo: octocat/hello-world
         provider: pypi
-        user: "DomDF"
+        username: "DomDF"
         password:
           secure: 1234abcd
         distributions: "sdist bdist_wheel"

diff --git a/tests/test_files/test_ci_cd_/test_make_travis_case_3_False_False_True_False_.yml b/tests/test_files/test_ci_cd_/test_make_travis_case_3_False_False_True_False_.yml
@@ -1,6 +1,7 @@
 # This file is managed by 'repo_helper'. Don't edit it directly.
 ---
 
+os: linux
 language: python
 dist: xenial
 cache: pip

diff --git a/tests/test_files/test_ci_cd_/test_make_travis_case_3_False_False_True_True_.yml b/tests/test_files/test_ci_cd_/test_make_travis_case_3_False_False_True_True_.yml
@@ -1,6 +1,7 @@
 # This file is managed by 'repo_helper'. Don't edit it directly.
 ---
 
+os: linux
 language: python
 dist: xenial
 cache: pip
@@ -48,7 +49,7 @@ jobs:
           tags: true
           repo: octocat/hello-world
         provider: pypi
-        user: "DomDF"
+        username: "DomDF"
         password:
           secure: 1234abcd
         distributions: "sdist bdist_wheel"

diff --git a/tests/test_files/test_ci_cd_/test_make_travis_case_3_False_True_False_False_.yml b/tests/test_files/test_ci_cd_/test_make_travis_case_3_False_True_False_False_.yml
@@ -1,6 +1,7 @@
 # This file is managed by 'repo_helper'. Don't edit it directly.
 ---
 
+os: linux
 language: python
 dist: xenial
 cache: pip

diff --git a/tests/test_files/test_ci_cd_/test_make_travis_case_3_False_True_False_True_.yml b/tests/test_files/test_ci_cd_/test_make_travis_case_3_False_True_False_True_.yml
@@ -1,6 +1,7 @@
 # This file is managed by 'repo_helper'. Don't edit it directly.
 ---
 
+os: linux
 language: python
 dist: xenial
 cache: pip
@@ -46,7 +47,7 @@ jobs:
           tags: true
           repo: octocat/hello-world
         provider: pypi
-        user: "DomDF"
+        username: "DomDF"
         password:
           secure: 1234abcd
         distributions: "sdist bdist_wheel"

diff --git a/tests/test_files/test_ci_cd_/test_make_travis_case_3_False_True_True_False_.yml b/tests/test_files/test_ci_cd_/test_make_travis_case_3_False_True_True_False_.yml
@@ -1,6 +1,7 @@
 # This file is managed by 'repo_helper'. Don't edit it directly.
 ---
 
+os: linux
 language: python
 dist: xenial
 cache: pip

diff --git a/tests/test_files/test_ci_cd_/test_make_travis_case_3_False_True_True_True_.yml b/tests/test_files/test_ci_cd_/test_make_travis_case_3_False_True_True_True_.yml
@@ -1,6 +1,7 @@
 # This file is managed by 'repo_helper'. Don't edit it directly.
 ---
 
+os: linux
 language: python
 dist: xenial
 cache: pip
@@ -48,7 +49,7 @@ jobs:
           tags: true
           repo: octocat/hello-world
         provider: pypi
-        user: "DomDF"
+        username: "DomDF"
         password:
           secure: 1234abcd
         distributions: "sdist bdist_wheel"

diff --git a/tests/test_files/test_ci_cd_/test_make_travis_case_3_True_False_False_False_.yml b/tests/test_files/test_ci_cd_/test_make_travis_case_3_True_False_False_False_.yml
@@ -1,6 +1,7 @@
 # This file is managed by 'repo_helper'. Don't edit it directly.
 ---
 
+os: linux
 language: python
 dist: xenial
 cache: pip

diff --git a/tests/test_files/test_ci_cd_/test_make_travis_case_3_True_False_False_True_.yml b/tests/test_files/test_ci_cd_/test_make_travis_case_3_True_False_False_True_.yml
@@ -1,6 +1,7 @@
 # This file is managed by 'repo_helper'. Don't edit it directly.
 ---
 
+os: linux
 language: python
 dist: xenial
 cache: pip
@@ -46,7 +47,7 @@ jobs:
           tags: true
           repo: octocat/hello-world
         provider: pypi
-        user: "DomDF"
+        username: "DomDF"
         password:
           secure: 1234abcd
         distributions: "sdist bdist_wheel"

diff --git a/tests/test_files/test_ci_cd_/test_make_travis_case_3_True_False_True_False_.yml b/tests/test_files/test_ci_cd_/test_make_travis_case_3_True_False_True_False_.yml
@@ -1,6 +1,7 @@
 # This file is managed by 'repo_helper'. Don't edit it directly.
 ---
 
+os: linux
 language: python
 dist: xenial
 cache: pip

diff --git a/tests/test_files/test_ci_cd_/test_make_travis_case_3_True_False_True_True_.yml b/tests/test_files/test_ci_cd_/test_make_travis_case_3_True_False_True_True_.yml
@@ -1,6 +1,7 @@
 # This file is managed by 'repo_helper'. Don't edit it directly.
 ---
 
+os: linux
 language: python
 dist: xenial
 cache: pip
@@ -48,7 +49,7 @@ jobs:
           tags: true
           repo: octocat/hello-world
         provider: pypi
-        user: "DomDF"
+        username: "DomDF"
         password:
           secure: 1234abcd
         distributions: "sdist bdist_wheel"

diff --git a/tests/test_files/test_ci_cd_/test_make_travis_case_3_True_True_False_False_.yml b/tests/test_files/test_ci_cd_/test_make_travis_case_3_True_True_False_False_.yml
@@ -1,6 +1,7 @@
 # This file is managed by 'repo_helper'. Don't edit it directly.
 ---
 
+os: linux
 language: python
 dist: xenial
 cache: pip

diff --git a/tests/test_files/test_ci_cd_/test_make_travis_case_3_True_True_False_True_.yml b/tests/test_files/test_ci_cd_/test_make_travis_case_3_True_True_False_True_.yml
@@ -1,6 +1,7 @@
 # This file is managed by 'repo_helper'. Don't edit it directly.
 ---
 
+os: linux
 language: python
 dist: xenial
 cache: pip
@@ -46,7 +47,7 @@ jobs:
           tags: true
           repo: octocat/hello-world
         provider: pypi
-        user: "DomDF"
+        username: "DomDF"
         password:
           secure: 1234abcd
         distributions: "sdist bdist_wheel"

diff --git a/tests/test_files/test_ci_cd_/test_make_travis_case_3_True_True_True_False_.yml b/tests/test_files/test_ci_cd_/test_make_travis_case_3_True_True_True_False_.yml
@@ -1,6 +1,7 @@
 # This file is managed by 'repo_helper'. Don't edit it directly.
 ---
 
+os: linux
 language: python
 dist: xenial
 cache: pip

diff --git a/tests/test_files/test_ci_cd_/test_make_travis_case_3_True_True_True_True_.yml b/tests/test_files/test_ci_cd_/test_make_travis_case_3_True_True_True_True_.yml
@@ -1,6 +1,7 @@
 # This file is managed by 'repo_helper'. Don't edit it directly.
 ---
 
+os: linux
 language: python
 dist: xenial
 cache: pip
@@ -48,7 +49,7 @@ jobs:
           tags: true
           repo: octocat/hello-world
         provider: pypi
-        user: "DomDF"
+        username: "DomDF"
         password:
           secure: 1234abcd
         distributions: "sdist bdist_wheel"

diff --git a/tests/test_files/test_ci_cd_/test_make_travis_case_4.yml b/tests/test_files/test_ci_cd_/test_make_travis_case_4.yml
@@ -1,6 +1,7 @@
 # This file is managed by 'repo_helper'. Don't edit it directly.
 ---
 
+os: linux
 language: python
 dist: bionic
 cache: pip
@@ -59,7 +60,7 @@ jobs:
           tags: true
           repo: octocat/hello-world
         provider: pypi
-        user: "DomDF"
+        username: "DomDF"
         password:
           secure: 1234abcd
         distributions: "sdist bdist_wheel"

diff --git a/tests/test_files/test_testing_/test_make_pre_commit.yaml b/tests/test_files/test_testing_/test_make_pre_commit.yaml
@@ -9,6 +9,7 @@ repos:
    hooks:
     - id: check-added-large-files
     - id: check-ast
+    - id: fix-byte-order-marker
     - id: check-byte-order-marker
     - id: check-case-conflict
     - id: check-executables-have-shebangs
@@ -19,9 +20,12 @@ repos:
     - id: check-symlinks
     - id: check-vcs-permalinks
     - id: detect-private-key
-    - id: end-of-file-fixer
     - id: trailing-whitespace
     - id: mixed-line-ending
+    - id: end-of-file-fixer
+    - id: name-tests-test
+      args:
+       - --django
 
  - repo: https://github.com/domdfcoding/pre-commit-hooks
    rev: v0.1.1