[Piglit] [PATCH] tox, README, cmake: Remove testing of end-of-life Python 3.4

Rhys Kidd rhyskidd at gmail.com
Sun Sep 1 01:59:54 UTC 2019


Python 3.4 reached end-of-life in March 2019 [0].

Clean up remaining configuration, corner-case and documentation references
to this prior Python version.

[0] https://www.python.org/dev/peps/pep-0429/#release-schedule

Fixes: 155b93e12 ("travis: Drop python3.4")
Signed-off-by: Rhys Kidd <rhyskidd at gmail.com>
---
 CMakeLists.txt | 2 +-
 README.md      | 2 +-
 tox.ini        | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b416cacb2..8851754af 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -227,7 +227,7 @@ IF(PIGLIT_BUILD_GLX_TESTS)
 ENDIF()
 
 set(Python_ADDITIONAL_VERSIONS
-    3.7 3.6 3.5 3.4 2.7)
+    3.7 3.6 3.5 2.7)
 find_package(PythonInterp REQUIRED)
 find_package(PythonSix 1.5.2 REQUIRED)
 find_package(PythonNumpy 1.7.0 REQUIRED)
diff --git a/README.md b/README.md
index 7366893f8..041a09f37 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ The original tests have been taken from
 
 First of all, you need to make sure that the following are installed:
 
-  - Python 2.7.x or >=3.4
+  - Python 2.7.x or >=3.5
   - Python Mako module
   - numpy (http://www.numpy.org)
   - six (https://pypi.python.org/pypi/six)
diff --git a/tox.ini b/tox.ini
index 1d6beca1a..45ff75404 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,34,35,36,37}-{generator,noaccel}, py{27,34,35,36,37}-accel-{win,nix}, py{27,34,35,36,37}-streams
+envlist = py{27,35,36,37}-{generator,noaccel}, py{27,35,36,37}-accel-{win,nix}, py{27,35,36,37}-streams
 skipsdist = True
 
 [pytest]
@@ -14,10 +14,10 @@ setenv =
 deps =
     accel-nix: lxml
     accel: simplejson
-    py{27,34,35,36}-generator: numpy==1.7.0
+    py{27,35,36}-generator: numpy==1.7.0
     py37-generator: numpy
     mock==1.0.1
-    py27-accel-nix,py{34,35,36,37}-{accel,noaccel}: psutil
+    py27-accel-nix,py{35,36,37}-{accel,noaccel}: psutil
     py27-accel-nix: backports.lzma
     py27-accel-nix: subprocess32
     py{35,36,37}: mako==1.0.2
@@ -26,7 +26,7 @@ deps =
     pytest-pythonpath
     pytest-raises
     pytest-timeout==1.2.1
-    py{27,34}: mako==0.8.0
+    py27: mako==0.8.0
     six==1.5.2
     {accel,noaccel,streams}: jsonschema
     streams: jsonstreams>=0.4.1
-- 
2.20.1



More information about the Piglit mailing list