Fix tests: clean up environments

python/setup-test-environment/build.gradle

@@ -7,6 +7,22 @@ plugins {
   id "com.jetbrains.python.envs" version "0.0.21"
 }
 
+/**
+ * Installs python interpreters for env. tests using conda or CPython.
+ * Utilizes following env variables:
+ *
+ * PYCHARM_PYTHONS -- path to install cPythons
+ * PYCHARM_PYTHON_VIRTUAL_ENVS -- path to install condas
+ *
+ * PYCHARM_USE_CONDA -- use conda (cPython will be used if not set)
+ *
+ * PYCHARM_ZIP_REPOSITORY -- to download unpacked pythons for Windows (default cpython does not support unattended installation)
+ * Recommended value: http://repo.labs.intellij.net/pycharm/python-archives-windows/
+ *
+ * Pitfall: TMP var on windows points to very long path inside of user local dir and may lead to errors.
+ * It is recommended to create "c:\temp\" with full write access and set TMP="c:\temp\" on Windows.
+ *
+ */
 
 envs {
   bootstrapDirectory = new File(System.getenv().getOrDefault("PYCHARM_PYTHONS", new File(buildDir, 'pythons').path))
@@ -54,26 +70,30 @@ envs {
     }
   }
 
-
-  createPython("django19",
+  createPython("py2_django18_full",
                "2.7.13",
-               ["django==1.9", "tox", "nose", "pytest", "Twisted", "behave", "lettuce>=0.2.22", "unittest2", "teamcity-messages"],
-               "python2.7\ndjango\nnose\npytest\nbehave\nlettuce\npackaging\ntox\nunittest2\ntwisted",
+               ["django==1.8", "tox", "nose", "pytest", "Twisted", "behave", "lettuce>=0.2.22", "unittest2", "teamcity-messages", "django-nose"]
+                + ( Os.isFamily(Os.FAMILY_WINDOWS) ? ['pypiwin32'] : []  ) //win32api is required for pypiwin32
+               ,
+               "python2.7\ndjango\nnose\npytest\nbehave\nlettuce\npackaging\ntox\nunittest2\ntwisted\ndjango-nose",
                true)
 
-  createPython("django110", "3.4.4", ["django==1.10", "django-nose"], "python3.4\ndjango\nskeletons\ndjango-nose")
+  createPython("py35_django20_full",
+               "3.5.3",
+               ["ipython==2.1", "django==2.0", "behave", "jinja2", "tox>=2.0", "nose", "pytest", "django-nose"],
+               "python3.4\npython3\nipython\nipython200\nskeletons\ndjango\nbehave\ntox\njinja2\npython34\npackaging\npytest\nnose\ndjango-nose",
+               true)
 
-  createPython("django111", "3.4.4", ["django==1.11"], "python3.4\ndjango")
-
-  createPython("python34",
+  // Mostly for tox
+  createPython("py34",
                "3.4.4",
-               ["ipython==2.1", "django==1.8", "behave", "jinja2", "tox>=2.0"],
-               "python3.4\npython3\nipython\nipython200\nskeletons\ndjango\nbehave\ntox\njinja2\npython34\npackaging",
+                [],
+               "python3.4",
                true)
 
-  createPython("python36",
-               "3.6.1",
-               ["django==1.9", "jinja2", "pandas"],
+  createPython("py36_django1_11",
+               "3.6.3",
+               ["django==1.11", "jinja2", "pandas"],
                "python3.6\npython3\ndjango\njinja2\npython34\npython36\npandas",
                true)