From 44ee13f38919cef43cafc0d65ccc6ac27ba10aa0 Mon Sep 17 00:00:00 2001 From: Dmitry Trofimov Date: Fri, 22 Apr 2016 00:00:37 +0200 Subject: [PATCH] Don't test jython on windows and test python 3.5 --- python/setup-test-environment/build.gradle | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/python/setup-test-environment/build.gradle b/python/setup-test-environment/build.gradle index 2cf09b99eb4c..c4e4a9639afc 100644 --- a/python/setup-test-environment/build.gradle +++ b/python/setup-test-environment/build.gradle @@ -1,10 +1,10 @@ +import org.apache.tools.ant.taskdefs.condition.Os + plugins { id "com.jetbrains.python.envs" version "0.0.6" } - - envs { bootstrapDirectory = new File(System.getenv().getOrDefault("PYCHARM_PYTHONS", new File(buildDir, 'pythons').path)) envsDirectory = new File(System.getenv().getOrDefault("PYCHARM_PYTHON_ENVS", new File(buildDir, 'envs').path)) @@ -33,10 +33,12 @@ envs { conda "python34", "3.4", ["ipython==2.1", "django==1.6", "behave", "jinja2", "tox==2.0"] textfile "python34/tags.txt", "python3\nipython\nipython200\nskeletons\ndjango\nbehave\ntox\njinja2\npython34\npackaging" - jython "jython25", [] - textfile "jython25/tags.txt", "jython" + if (!Os.isFamily(Os.FAMILY_WINDOWS)) { + jython "jython25", [] + textfile "jython25/tags.txt", "jython" + } - conda "django_latest", "3.4", ["django"] + conda "django_latest", "3.5", ["django"] textfile "django_latest/tags.txt", "django" }