Revert "Remove Python2 from the tests"

ahupp · ahupp · commit e9287aff8793 · 2021-01-15T13:06:32.000-08:00
This reverts commit 4a810b4.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ dist: xenial
 cache: pip
 
 python:
+  - "2.7"
   - "3.5"
   - "3.6"
   - "3.7"
diff --git 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 file which
+RUN yes | pacman -S python python2 file which
 COPY . /python-magic
 CMD cd /python-magic/test && python3 ./run.py
diff --git a/test/Dockerfile_bionic b/test/Dockerfile_bionic
@@ -1,5 +1,6 @@
 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
@@ -1,5 +1,5 @@
 FROM centos:7
 RUN yum -y update
-RUN yum -y install file-devel python3 which
+RUN yum -y install file-devel python3 python2 which
 COPY . /python-magic
 CMD cd /python-magic/test && python3 ./run.py
diff --git 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 which
+RUN yum -y install file-libs python3 python2 which
 COPY . /python-magic
 CMD cd /python-magic/test && python3 ./run.py
diff --git a/test/Dockerfile_focal b/test/Dockerfile_focal
@@ -1,5 +1,6 @@
 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
@@ -1,5 +1,6 @@
 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
@@ -29,4 +29,6 @@ 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", "python3.9"])
+
diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,7 @@
 [tox]
 envlist =
     coverage-clean,
+    py27,
     py35,
     py36,
     py37,

-Original file line number
+Diff line change
 cache: pip
 python:
 +  - "2.7"
   - "3.5"
   - "3.6"
   - "3.7"