summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSchoolGuy <matrixfueller@gmail.com>2021-01-13 09:12:57 +0100
committerSchoolGuy <matrixfueller@gmail.com>2021-01-13 09:12:57 +0100
commit4a810b4f30f161b889d59cf2a207820fc0c731b7 (patch)
treeb122dde5784183d325b12c688aae79dd7a3ace08
parentac6143c4a16b3172ce38a2766861a166288ff8ad (diff)
downloadpython-magic-4a810b4f30f161b889d59cf2a207820fc0c731b7.tar.gz
Remove Python2 from the tests
-rw-r--r--.travis.yml1
-rwxr-xr-xtest/Dockerfile_archlinux2
-rwxr-xr-xtest/Dockerfile_bionic1
-rw-r--r--test/Dockerfile_centos72
-rw-r--r--test/Dockerfile_centos82
-rwxr-xr-xtest/Dockerfile_focal1
-rwxr-xr-xtest/Dockerfile_xenial1
-rw-r--r--test/run.py2
-rw-r--r--tox.ini1
9 files changed, 4 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index 7c0ddc8..8bc3569 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,6 @@ dist: xenial
cache: pip
python:
- - "2.7"
- "3.5"
- "3.6"
- "3.7"
diff --git a/test/Dockerfile_archlinux b/test/Dockerfile_archlinux
index 677add4..1410cd1 100755
--- a/test/Dockerfile_archlinux
+++ b/test/Dockerfile_archlinux
@@ -1,5 +1,5 @@
FROM archlinux:20200505
RUN yes | pacman -Syyu --overwrite '*'
-RUN yes | pacman -S python python2 file which
+RUN yes | pacman -S python file which
COPY . /python-magic
CMD cd /python-magic/test && python3 ./run.py
diff --git a/test/Dockerfile_bionic b/test/Dockerfile_bionic
index e335b8e..0c9893e 100755
--- a/test/Dockerfile_bionic
+++ b/test/Dockerfile_bionic
@@ -1,6 +1,5 @@
FROM ubuntu:bionic
RUN apt-get update
-RUN apt-get -y install python
RUN apt-get -y install python3
RUN apt-get -y install locales
RUN locale-gen en_US.UTF-8
diff --git a/test/Dockerfile_centos7 b/test/Dockerfile_centos7
index 8620e7e..c418834 100644
--- a/test/Dockerfile_centos7
+++ b/test/Dockerfile_centos7
@@ -1,5 +1,5 @@
FROM centos:7
RUN yum -y update
-RUN yum -y install file-devel python3 python2 which
+RUN yum -y install file-devel python3 which
COPY . /python-magic
CMD cd /python-magic/test && python3 ./run.py
diff --git a/test/Dockerfile_centos8 b/test/Dockerfile_centos8
index 505221b..ab68288 100644
--- a/test/Dockerfile_centos8
+++ b/test/Dockerfile_centos8
@@ -1,5 +1,5 @@
FROM centos:8
RUN yum -y update
-RUN yum -y install file-libs python3 python2 which
+RUN yum -y install file-libs python3 which
COPY . /python-magic
CMD cd /python-magic/test && python3 ./run.py
diff --git a/test/Dockerfile_focal b/test/Dockerfile_focal
index 74e4d78..b0b1c1c 100755
--- a/test/Dockerfile_focal
+++ b/test/Dockerfile_focal
@@ -1,6 +1,5 @@
FROM ubuntu:focal
RUN apt-get update
-RUN apt-get -y install python2
RUN apt-get -y install python3
RUN apt-get -y install locales
RUN locale-gen en_US.UTF-8
diff --git a/test/Dockerfile_xenial b/test/Dockerfile_xenial
index bc0440b..64533c9 100755
--- a/test/Dockerfile_xenial
+++ b/test/Dockerfile_xenial
@@ -1,6 +1,5 @@
FROM ubuntu:xenial
RUN apt-get update
-RUN apt-get -y install python
RUN apt-get -y install python3
RUN apt-get -y install locales
RUN locale-gen en_US.UTF-8
diff --git a/test/run.py b/test/run.py
index 6b37555..a9dd39a 100644
--- a/test/run.py
+++ b/test/run.py
@@ -29,5 +29,5 @@ def run_test(versions):
if not found:
sys.exit("No versions found: " + str(versions))
-run_test(["python2", "python2.7"])
+
run_test(["python3.5", "python3.6", "python3.7", "python3.8"])
diff --git a/tox.ini b/tox.ini
index 2d5aa01..94a5b4f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,6 @@
[tox]
envlist =
coverage-clean,
- py27,
py35,
py36,
py37,