diff --git a/python/testData/toxtest/toxConcreteEnv/tox.ini b/python/testData/toxtest/toxConcreteEnv/tox.ini index fe82bb033b32..22d87fd02293 100644 --- a/python/testData/toxtest/toxConcreteEnv/tox.ini +++ b/python/testData/toxtest/toxConcreteEnv/tox.ini @@ -1,5 +1,5 @@ [tox] skipsdist=True -envlist = py37, py36 +envlist = py37, py38 [testenv] commands=python -c "import sys; assert sys.version_info[:2] == (3,7)" \ No newline at end of file diff --git a/python/testData/toxtest/toxNose/tox.ini b/python/testData/toxtest/toxNose/tox.ini index 869f6ec6dbf3..ba19a890da9a 100644 --- a/python/testData/toxtest/toxNose/tox.ini +++ b/python/testData/toxtest/toxNose/tox.ini @@ -1,6 +1,6 @@ [tox] skipsdist=True -envlist = py37, py36 +envlist = py37, py38 [testenv] deps=nose commands=nosetests -s \ No newline at end of file diff --git a/python/testData/toxtest/toxOneInterpreter/tox.ini b/python/testData/toxtest/toxOneInterpreter/tox.ini index d8aca8155214..d70253b3fd9c 100644 --- a/python/testData/toxtest/toxOneInterpreter/tox.ini +++ b/python/testData/toxtest/toxOneInterpreter/tox.ini @@ -1,6 +1,6 @@ [tox] skipsdist=True -envlist = py37, py36 +envlist = py37, py38 skip_missing_interpreters = True [testenv:py37] 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 620b713bb760..89703bd99ba5 100644 --- a/python/testData/toxtest/toxPyTest/tox.ini +++ b/python/testData/toxtest/toxPyTest/tox.ini @@ -1,6 +1,6 @@ [tox] skipsdist=True -envlist = py37, py36 +envlist = py37, py38 [testenv] deps=pytest commands=pytest \ No newline at end of file diff --git a/python/testData/toxtest/toxPyTestPy3k/tox.ini b/python/testData/toxtest/toxPyTestPy3k/tox.ini index f64211addbfa..30011edd52c8 100644 --- a/python/testData/toxtest/toxPyTestPy3k/tox.ini +++ b/python/testData/toxtest/toxPyTestPy3k/tox.ini @@ -1,6 +1,6 @@ [tox] skipsdist=True -envlist = py36 +envlist = py38 [testenv] deps=pytest commands=pytest diff --git a/python/testData/toxtest/toxPyTestXDist/tox.ini b/python/testData/toxtest/toxPyTestXDist/tox.ini index e83ee9abfc17..163643c0fa98 100644 --- a/python/testData/toxtest/toxPyTestXDist/tox.ini +++ b/python/testData/toxtest/toxPyTestXDist/tox.ini @@ -1,6 +1,6 @@ [tox] skipsdist=True -envlist = py36,py37 +envlist = py38,py37 [testenv] deps=pytest pytest-xdist diff --git a/python/testData/toxtest/toxRerun/tox.ini b/python/testData/toxtest/toxRerun/tox.ini index fe82bb033b32..22d87fd02293 100644 --- a/python/testData/toxtest/toxRerun/tox.ini +++ b/python/testData/toxtest/toxRerun/tox.ini @@ -1,5 +1,5 @@ [tox] skipsdist=True -envlist = py37, py36 +envlist = py37, py38 [testenv] commands=python -c "import sys; assert sys.version_info[:2] == (3,7)" \ No newline at end of file diff --git a/python/testData/toxtest/toxUnitTest/tox.ini b/python/testData/toxtest/toxUnitTest/tox.ini index 5f45fa051638..23a2f4caf19d 100644 --- a/python/testData/toxtest/toxUnitTest/tox.ini +++ b/python/testData/toxtest/toxUnitTest/tox.ini @@ -1,5 +1,5 @@ [tox] skipsdist=True -envlist = py37, py36 +envlist = py37, py38 [testenv] commands=python -m unittest discover \ No newline at end of file diff --git a/python/testSrc/com/jetbrains/env/python/PyToxTest.java b/python/testSrc/com/jetbrains/env/python/PyToxTest.java index 96a29d5b3964..70e861c02817 100644 --- a/python/testSrc/com/jetbrains/env/python/PyToxTest.java +++ b/python/testSrc/com/jetbrains/env/python/PyToxTest.java @@ -51,22 +51,6 @@ public final class PyToxTest extends PyEnvTestCase { Integer.MAX_VALUE)); } - /** - * Check tox nose runner - */ - @Test - public void testToxNose() { - runPythonTest(new MyPyProcessWithConsoleTestTask("/toxtest/toxNose/", 1, - () -> new MyTestProcessRunner(), - Arrays.asList( - Pair.create("py37", new InterpreterExpectations("", true)), - // Does not support 3.6 - Pair.create("py36", new InterpreterExpectations("SyntaxError", false)) - ), - Integer.MAX_VALUE) - ); - } - /** * Check tox pytest runner */ @@ -76,8 +60,7 @@ public final class PyToxTest extends PyEnvTestCase { () -> new MyTestProcessRunner(), Arrays.asList( Pair.create("py37", new InterpreterExpectations("", true)), - // Does not support 3.4 - Pair.create("py36", new InterpreterExpectations("SyntaxError", false)) + Pair.create("py38", new InterpreterExpectations("Assertion", false)) ), Integer.MAX_VALUE) ); @@ -89,7 +72,7 @@ public final class PyToxTest extends PyEnvTestCase { runPythonTest(new MyPyProcessWithConsoleTestTask("/toxtest/toxPyTestXDist/", 1, () -> new MyTestProcessRunner(), Arrays.asList( - Pair.create("py36", new InterpreterExpectations("", false)), + Pair.create("py38", new InterpreterExpectations("", false)), Pair.create("py37", new InterpreterExpectations("", true)) ), Integer.MAX_VALUE) { @@ -114,7 +97,7 @@ public final class PyToxTest extends PyEnvTestCase { runPythonTest(new MyPyProcessWithConsoleTestTask("/toxtest/toxPyTestPy3k/", 1, () -> new MyTestProcessRunner(), Collections.singletonList( - Pair.create("py36", new InterpreterExpectations("", true)) + Pair.create("py38", new InterpreterExpectations("", true)) ), Integer.MAX_VALUE) ); @@ -129,8 +112,7 @@ public final class PyToxTest extends PyEnvTestCase { () -> new MyTestProcessRunner(), Arrays.asList( Pair.create("py37", new InterpreterExpectations("", true)), - // Does not support 3.4 - Pair.create("py36", new InterpreterExpectations("SyntaxError", false)) + Pair.create("py38", new InterpreterExpectations("Assertion", false)) ), Integer.MAX_VALUE) ); @@ -145,7 +127,7 @@ public final class PyToxTest extends PyEnvTestCase { () -> new MyTestProcessRunner(), Arrays.asList( Pair.create("py37", new InterpreterExpectations("ython 3.7", true)), - Pair.create("py36", new InterpreterExpectations("", false)) + Pair.create("py38", new InterpreterExpectations("", false)) ), Integer.MAX_VALUE) ); @@ -192,7 +174,7 @@ public final class PyToxTest extends PyEnvTestCase { Arrays.asList( //26 and 37 only used for first time, they aren't used after rerun Pair.create("py37", new InterpreterExpectations("", true, 1)), - Pair.create("py36", new InterpreterExpectations("", false)) + Pair.create("py38", new InterpreterExpectations("", false)) ), Integer.MAX_VALUE) ); @@ -241,7 +223,7 @@ public final class PyToxTest extends PyEnvTestCase { */ @Test public void testConcreteEnv() { - final String[] envsToRun = {"py37", "py36"}; + final String[] envsToRun = {"py37", "py38"}; runPythonTest( new PyProcessWithConsoleTestTask>("/toxtest/toxSuccess/", SdkCreationType.EMPTY_SDK) { @NotNull