From 35a1a97cb7390691d840781bac7fa8938e4996d4 Mon Sep 17 00:00:00 2001 From: "Ilya.Kazakevich" Date: Fri, 2 Mar 2018 00:57:34 +0300 Subject: [PATCH] Old interpreters removed from tox tests --- python/testData/toxtest/toxConcreteEnv/tox.ini | 2 +- python/testData/toxtest/toxOneInterpreter/tox.ini | 2 +- python/testData/toxtest/toxPyTest/tox.ini | 2 +- python/testData/toxtest/toxRerun/tox.ini | 2 +- .../toxtest/toxSimpleRun/sample.egg-info/PKG-INFO | 1 - python/testData/toxtest/toxSimpleRun/setup.py | 3 --- python/testData/toxtest/toxSimpleRun/tox.ini | 2 +- python/testData/toxtest/toxSuccess/tox.ini | 2 +- python/testData/toxtest/toxUnitTest/tox.ini | 2 +- python/testSrc/com/jetbrains/env/PyToxTest.java | 15 +-------------- 10 files changed, 8 insertions(+), 25 deletions(-) diff --git a/python/testData/toxtest/toxConcreteEnv/tox.ini b/python/testData/toxtest/toxConcreteEnv/tox.ini index 68d81edafd85..c1569e2c8034 100644 --- a/python/testData/toxtest/toxConcreteEnv/tox.ini +++ b/python/testData/toxtest/toxConcreteEnv/tox.ini @@ -1,5 +1,5 @@ [tox] skipsdist=True -envlist = py26, py27, py32, py34 +envlist = py27, py34 [testenv] commands=python -c "print 1" \ No newline at end of file diff --git a/python/testData/toxtest/toxOneInterpreter/tox.ini b/python/testData/toxtest/toxOneInterpreter/tox.ini index b11c4b3ccc10..5ff6e82a5a2a 100644 --- a/python/testData/toxtest/toxOneInterpreter/tox.ini +++ b/python/testData/toxtest/toxOneInterpreter/tox.ini @@ -1,6 +1,6 @@ [tox] skipsdist=True -envlist = py26, py27, py34, py32 +envlist = py27, py34 skip_missing_interpreters = True [testenv:py27] commands=python -c "import sys; print('Python ' + str(sys.version))" diff --git a/python/testData/toxtest/toxPyTest/tox.ini b/python/testData/toxtest/toxPyTest/tox.ini index 0a695b81a6c9..2008ca595bd4 100644 --- a/python/testData/toxtest/toxPyTest/tox.ini +++ b/python/testData/toxtest/toxPyTest/tox.ini @@ -1,6 +1,6 @@ [tox] skipsdist=True -envlist = py26, py27, py34, py32 +envlist = py27, py34 [testenv] deps=pytest commands=py.test \ No newline at end of file diff --git a/python/testData/toxtest/toxRerun/tox.ini b/python/testData/toxtest/toxRerun/tox.ini index 68d81edafd85..c1569e2c8034 100644 --- a/python/testData/toxtest/toxRerun/tox.ini +++ b/python/testData/toxtest/toxRerun/tox.ini @@ -1,5 +1,5 @@ [tox] skipsdist=True -envlist = py26, py27, py32, py34 +envlist = py27, py34 [testenv] commands=python -c "print 1" \ No newline at end of file diff --git a/python/testData/toxtest/toxSimpleRun/sample.egg-info/PKG-INFO b/python/testData/toxtest/toxSimpleRun/sample.egg-info/PKG-INFO index 11312d778c2b..73b22bfee4d3 100644 --- a/python/testData/toxtest/toxSimpleRun/sample.egg-info/PKG-INFO +++ b/python/testData/toxtest/toxSimpleRun/sample.egg-info/PKG-INFO @@ -14,7 +14,6 @@ Classifier: Intended Audience :: Developers Classifier: Topic :: Software Development :: Build Tools Classifier: License :: OSI Approved :: MIT License Classifier: Programming Language :: Python :: 2 -Classifier: Programming Language :: Python :: 2.6 Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3.2 diff --git a/python/testData/toxtest/toxSimpleRun/setup.py b/python/testData/toxtest/toxSimpleRun/setup.py index c081c0d62c20..9570a36ed5e8 100644 --- a/python/testData/toxtest/toxSimpleRun/setup.py +++ b/python/testData/toxtest/toxSimpleRun/setup.py @@ -55,11 +55,8 @@ setup( # Specify the Python versions you support here. In particular, ensure # that you indicate whether you support Python 2, Python 3 or both. 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.2', - 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', ], diff --git a/python/testData/toxtest/toxSimpleRun/tox.ini b/python/testData/toxtest/toxSimpleRun/tox.ini index 79f06515fcee..3e9ae2758aa1 100644 --- a/python/testData/toxtest/toxSimpleRun/tox.ini +++ b/python/testData/toxtest/toxSimpleRun/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27,py26 +envlist = py27 [testenv] deps=nose diff --git a/python/testData/toxtest/toxSuccess/tox.ini b/python/testData/toxtest/toxSuccess/tox.ini index 8b83f8ca9be7..d25941d8cf86 100644 --- a/python/testData/toxtest/toxSuccess/tox.ini +++ b/python/testData/toxtest/toxSuccess/tox.ini @@ -1,5 +1,5 @@ [tox] skipsdist=True -envlist = py26, py27, py32, py34 +envlist = py27, py34 [testenv] commands=python -m unittest discover \ No newline at end of file diff --git a/python/testData/toxtest/toxUnitTest/tox.ini b/python/testData/toxtest/toxUnitTest/tox.ini index e5baa4257a76..d25941d8cf86 100644 --- a/python/testData/toxtest/toxUnitTest/tox.ini +++ b/python/testData/toxtest/toxUnitTest/tox.ini @@ -1,5 +1,5 @@ [tox] skipsdist=True -envlist = py26, py27, py34, py32 +envlist = py27, py34 [testenv] commands=python -m unittest discover \ No newline at end of file diff --git a/python/testSrc/com/jetbrains/env/PyToxTest.java b/python/testSrc/com/jetbrains/env/PyToxTest.java index 7b34916b9bc4..003e37f87fdd 100644 --- a/python/testSrc/com/jetbrains/env/PyToxTest.java +++ b/python/testSrc/com/jetbrains/env/PyToxTest.java @@ -54,10 +54,7 @@ public final class PyToxTest extends PyEnvTestCase { public void testToxSimpleRun() { runPythonTest(new MyPyProcessWithConsoleTestTask("/toxtest/toxSimpleRun/", 2, () -> new MyTestProcessRunner(), - Arrays.asList( - // Should fail, no skip in 26 - Pair.create("py26", new InterpreterExpectations( - "AttributeError: 'module' object has no attribute 'skip'", false)), + Collections.singletonList( Pair.create("py27", new InterpreterExpectations("", true)) ), Integer.MAX_VALUE)); @@ -87,10 +84,8 @@ public final class PyToxTest extends PyEnvTestCase { runPythonTest(new MyPyProcessWithConsoleTestTask("/toxtest/toxPyTest/", 1, () -> new MyTestProcessRunner(), Arrays.asList( - Pair.create("py26", new InterpreterExpectations("", true)), Pair.create("py27", new InterpreterExpectations("", true)), // Does not support 3.4 - Pair.create("py32", new InterpreterExpectations("SyntaxError", false)), Pair.create("py34", new InterpreterExpectations("SyntaxError", false)) ), Integer.MAX_VALUE) @@ -105,10 +100,8 @@ public final class PyToxTest extends PyEnvTestCase { runPythonTest(new MyPyProcessWithConsoleTestTask("/toxtest/toxUnitTest/", 1, () -> new MyTestProcessRunner(), Arrays.asList( - Pair.create("py26", new InterpreterExpectations("", true)), Pair.create("py27", new InterpreterExpectations("", true)), // Does not support 3.4 - Pair.create("py32", new InterpreterExpectations("SyntaxError", false)), Pair.create("py34", new InterpreterExpectations("SyntaxError", false)) ), Integer.MAX_VALUE) @@ -123,9 +116,7 @@ public final class PyToxTest extends PyEnvTestCase { runPythonTest(new MyPyProcessWithConsoleTestTask("/toxtest/toxOneInterpreter/", 0, () -> new MyTestProcessRunner(), Arrays.asList( - Pair.create("py26", new InterpreterExpectations("", false)), Pair.create("py27", new InterpreterExpectations("ython 2.7", true)), - Pair.create("py32", new InterpreterExpectations("", false)), Pair.create("py34", new InterpreterExpectations("", false)) ), Integer.MAX_VALUE) @@ -155,10 +146,8 @@ public final class PyToxTest extends PyEnvTestCase { runPythonTest(new MyPyProcessWithConsoleTestTask("/toxtest/toxSuccess/", 1, () -> new MyTestProcessRunner(), Arrays.asList( - Pair.create("py26", new InterpreterExpectations("I am 2.6", true)), Pair.create("py27", new InterpreterExpectations("I am 2.7", true)), // Should have output - Pair.create("py32", new InterpreterExpectations("I am 3.2", true)), Pair.create("py34", new InterpreterExpectations("I am 3.4", true)) ), Integer.MAX_VALUE) @@ -174,9 +163,7 @@ public final class PyToxTest extends PyEnvTestCase { () -> new MyTestProcessRunner(1), Arrays.asList( //26 and 27 only used for first time, they aren't used after rerun - Pair.create("py26", new InterpreterExpectations("", true, 1)), Pair.create("py27", new InterpreterExpectations("", true, 1)), - Pair.create("py32", new InterpreterExpectations("", false)), Pair.create("py34", new InterpreterExpectations("", false)) ), Integer.MAX_VALUE)