From 10ddf5ed8cde0f12ae62d3116a4811570bfd7a04 Mon Sep 17 00:00:00 2001 From: Ryan Hiebert Date: Wed, 7 Dec 2022 18:22:10 -0600 Subject: [PATCH 1/4] Explicit non-support for tox 4 --- .gitignore | 1 + docs/conf.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8f5d122..5cccd49 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ docs/_build/ /htmlcov/ /.pytest_cache/ /.vscode/ +/.venv/ diff --git a/docs/conf.py b/docs/conf.py index be77005..1388d4f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -65,7 +65,7 @@ # # This is also used if you do content translation via gettext catalogs. # Usually you set "language" from the command line for these cases. -language = None +language = 'en' # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. diff --git a/setup.py b/setup.py index 2fdba3e..ee3ac40 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ def default_environment(): entry_points={ 'tox': ['travis = tox_travis.hooks'], }, - install_requires=['tox>=2.0'], + install_requires=['tox>=2.0,<4'], python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*', classifiers=[ 'Development Status :: 4 - Beta', From 8cc3e2c085e6bf93e5aeb592e0b26df8338f27ba Mon Sep 17 00:00:00 2001 From: Ryan Hiebert Date: Wed, 7 Dec 2022 18:26:10 -0600 Subject: [PATCH 2/4] Add empty pre-commit config --- .pre-commit-config.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..e69de29 From 8981fb02b75e1654de57b77078aef1e6d4d8d5fb Mon Sep 17 00:00:00 2001 From: Ryan Hiebert Date: Wed, 7 Dec 2022 18:29:00 -0600 Subject: [PATCH 3/4] Pre-commit config --- .pre-commit-config.yaml | 7 +++++++ LICENSE | 1 - docs/Makefile | 2 +- docs/envlist.rst | 1 - 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e69de29..859ac3d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -0,0 +1,7 @@ +repos: +- repo: https://github.com/pre-commit/pre-commit-hooks + rev: v2.3.0 + hooks: + - id: check-yaml + - id: end-of-file-fixer + - id: trailing-whitespace diff --git a/LICENSE b/LICENSE index d4b6cf1..8a65536 100644 --- a/LICENSE +++ b/LICENSE @@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - diff --git a/docs/Makefile b/docs/Makefile index 4c754ef..37c470f 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -17,4 +17,4 @@ help: # Catch-all target: route all unknown targets to Sphinx using the new # "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). %: Makefile - @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) \ No newline at end of file + @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) diff --git a/docs/envlist.rst b/docs/envlist.rst index 32d1372..30f7ef0 100644 --- a/docs/envlist.rst +++ b/docs/envlist.rst @@ -153,4 +153,3 @@ And in your ``tox.ini``: [travis] unignore_outcomes = True - From 7c4ef73f1984926fd0ef739081288fd9cf2c6870 Mon Sep 17 00:00:00 2001 From: Ryan Hiebert Date: Wed, 7 Dec 2022 18:32:40 -0600 Subject: [PATCH 4/4] Bump version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ee3ac40..d84402b 100644 --- a/setup.py +++ b/setup.py @@ -62,7 +62,7 @@ def default_environment(): author_email='ryan@ryanhiebert.com', url='https://github.com/tox-dev/tox-travis', license='MIT', - version='0.12', + version='0.13', package_dir={'': 'src'}, packages=find_packages('src'), entry_points={