Merge pull request #24 from dataiku/chore/dss12-sc-132089-allow-py36-to-py311

jules-casoli · web-flow · commit 0cba16894434 · 2023-05-02T08:18:36.000+02:00
Allow py36 to py311
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## Version 1.3.0
+- Add more supported Python versions. This plugin can now use 2.7 (deprecated), 3.6, 3.7, 3.8, 3.9, 3.10 (experimental), 3.11 (experimental)
+
 ## Version 1.2.0
 - Fix the cluster configuration's merging mechanism for string parameters
 - Remove support for legacy authorization (ABAC)
diff --git a/code-env/python/desc.json b/code-env/python/desc.json
@@ -1,6 +1,7 @@
 {
-  "acceptedPythonInterpreters": ["PYTHON36", "PYTHON37"],
+  "acceptedPythonInterpreters": ["PYTHON27", "PYTHON36", "PYTHON37", "PYTHON38", "PYTHON39", "PYTHON310", "PYTHON311"],
   "forceConda": false,
   "installCorePackages": true,
+  "corePackagesSet": "AUTO",
   "installJupyterSupport": false
 }
diff --git a/plugin.json b/plugin.json
@@ -1,6 +1,6 @@
 {
     "id": "gke-clusters",
-    "version": "1.2.0",
+    "version": "1.3.0",
     "meta": {
         "label": "GKE clusters",
         "description": "Interact with Google Kubernetes Engine clusters",
diff --git a/python-lib/dku_utils/access.py b/python-lib/dku_utils/access.py
@@ -1,5 +1,8 @@
 from six import text_type
-from collections import Mapping, Iterable
+try:
+    from collections.abc import Mapping, Iterable # py3
+except ImportError:
+    from collections import Mapping, Iterable # py2
 import sys
 
 if sys.version_info > (3,):

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`		`- "acceptedPythonInterpreters": ["PYTHON36", "PYTHON37"],`
	`2`	`+ "acceptedPythonInterpreters": ["PYTHON27", "PYTHON36", "PYTHON37", "PYTHON38", "PYTHON39", "PYTHON310", "PYTHON311"],`
`3`	`3`	`"forceConda": false,`
`4`	`4`	`"installCorePackages": true,`
	`5`	`+ "corePackagesSet": "AUTO",`
`5`	`6`	`"installJupyterSupport": false`
`6`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"id": "gke-clusters",`
`3`		`- "version": "1.2.0",`
	`3`	`+ "version": "1.3.0",`
`4`	`4`	`"meta": {`
`5`	`5`	`"label": "GKE clusters",`
`6`	`6`	`"description": "Interact with Google Kubernetes Engine clusters",`