From a7b1af76e9f5f4603638e956cec835111f924ec7 Mon Sep 17 00:00:00 2001 From: Brice Arnould Date: Sun, 24 May 2015 18:08:16 +0200 Subject: [PATCH] Drop compatibility with Python 3.2 Python 3.3 now is the minimum (Pygments 2.0 no longer supports Python 3.2 anyway). --- .travis.yml | 2 -- build-requirements.txt | 1 - tests/test_main.py | 6 +----- tests/test_user_code_template.py | 6 +----- 4 files changed, 2 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4ec40f7..d72814a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,10 @@ language: python python: - - "3.2" - "3.3" - "3.4" install: - pip install --use-wheel --use-mirrors -r build-requirements.txt - pip install --use-wheel --use-mirrors coveralls - - python -c 'import sys; sys.exit(sys.version_info[:2] <= (3, 2))' || pip install --use-wheel --use-mirrors --upgrade "pygments==1.6" script: - coverage run --source=py1 setup.py test # Checks that pip can install the package. diff --git a/build-requirements.txt b/build-requirements.txt index e04d997..47d01db 100644 --- a/build-requirements.txt +++ b/build-requirements.txt @@ -1,4 +1,3 @@ -mock sphinx>=1.3 sphinx_rtd_theme>=0.1.8 diff --git a/tests/test_main.py b/tests/test_main.py index e44640e..62eb5c2 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -29,11 +29,7 @@ import io import unittest -try: - from unittest import mock -except ImportError: - # Allows compatibility with Python < 3.3 if mock is installed. - import mock +from unittest import mock import sys from py1 import constants diff --git a/tests/test_user_code_template.py b/tests/test_user_code_template.py index 9b2835e..8030d85 100644 --- a/tests/test_user_code_template.py +++ b/tests/test_user_code_template.py @@ -26,11 +26,7 @@ import io import unittest -try: - from unittest import mock -except ImportError: - # Allows compatibility with Python < 3.3 if mock is installed. - import mock +from unittest import mock import sys from py1 import user_code_template