From a5f312e4e10337cc0306370c28995ab75478ad89 Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Wed, 1 Jun 2016 08:40:07 -0700 Subject: [PATCH] Use python3.4 and 3.5 instead of 3.3 and 3.4 --- CONTRIBUTING.md | 2 +- setup.py | 1 - testing/resources/arbitrary_bytes_repo/hooks.yaml | 2 +- testing/resources/python3_hooks_repo/hooks.yaml | 2 +- tests/clientlib/validate_manifest_test.py | 2 +- tests/repository_test.py | 4 ++-- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8d2962c7..a5170902 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,8 +6,8 @@ a complete list) - git (A sufficiently newer version is required to run pre-push tests) - python - - python3.3 (Required by a test which checks different python versions) - python3.4 (Required by a test which checks different python versions) + - python3.5 (Required by a test which checks different python versions) - tox (or virtualenv) - ruby + gem diff --git a/setup.py b/setup.py index 240db429..1923b7ea 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,6 @@ setup( 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: Implementation :: CPython', diff --git a/testing/resources/arbitrary_bytes_repo/hooks.yaml b/testing/resources/arbitrary_bytes_repo/hooks.yaml index becc2837..0320f025 100644 --- a/testing/resources/arbitrary_bytes_repo/hooks.yaml +++ b/testing/resources/arbitrary_bytes_repo/hooks.yaml @@ -2,5 +2,5 @@ name: Python 3 Hook entry: python3-hook language: python - language_version: python3.3 + language_version: python3.5 files: \.py$ diff --git a/testing/resources/python3_hooks_repo/hooks.yaml b/testing/resources/python3_hooks_repo/hooks.yaml index becc2837..0320f025 100644 --- a/testing/resources/python3_hooks_repo/hooks.yaml +++ b/testing/resources/python3_hooks_repo/hooks.yaml @@ -2,5 +2,5 @@ name: Python 3 Hook entry: python3-hook language: python - language_version: python3.3 + language_version: python3.5 files: \.py$ diff --git a/tests/clientlib/validate_manifest_test.py b/tests/clientlib/validate_manifest_test.py index 4e51ade9..63ca504c 100644 --- a/tests/clientlib/validate_manifest_test.py +++ b/tests/clientlib/validate_manifest_test.py @@ -75,7 +75,7 @@ def test_additional_manifest_failing(obj): 'name': 'b', 'entry': 'c', 'language': 'python', - 'language_version': 'python3.3', + 'language_version': 'python3.4', 'files': r'\.py$', }], True, diff --git a/tests/repository_test.py b/tests/repository_test.py index 28ecc275..f86defcc 100644 --- a/tests/repository_test.py +++ b/tests/repository_test.py @@ -101,7 +101,7 @@ def test_switch_language_versions_doesnt_clobber(tempdir_factory, store): assert ret[1].replace(b'\r\n', b'\n') == expected_output run_on_version('python3.4', b'3.4\n[]\nHello World\n') - run_on_version('python3.3', b'3.3\n[]\nHello World\n') + run_on_version('python3.5', b'3.5\n[]\nHello World\n') @pytest.mark.integration @@ -110,7 +110,7 @@ def test_versioned_python_hook(tempdir_factory, store): tempdir_factory, store, 'python3_hooks_repo', 'python3-hook', [os.devnull], - b"3.3\n['" + five.to_bytes(os.devnull) + b"']\nHello World\n", + b"3.5\n['" + five.to_bytes(os.devnull) + b"']\nHello World\n", )