Merge pull request #43 from dataiku/chore/dss12-sc-132150-necessary-u…

…pdate [sc-132150] [sharepoint-online] Updating desc.json for DSS 12 compliance
dataiku · Apr 25, 2023 · ef3c642 · ef3c642
2 parents 90c1f30 + 26d3ad4
commit ef3c642
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [Version 1.0.14](https://github.com/dataiku/dss-plugin-sharepoint-online/releases/tag/v1.0.14) - Bugfix release - 2023-04-18
+
+- Updated code-env descriptor for DSS 12
+
 ## [Version 1.0.13](https://github.com/dataiku/dss-plugin-sharepoint-online/releases/tag/v1.0.13) - Bugfix release - 2022-10-13
 
 - Allow file to be overwritten using export recipe without `clear before export` activated

diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2020-2022 Dataiku
+   Copyright 2020-2023 Dataiku
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/Makefile b/Makefile
@@ -21,8 +21,8 @@ plugin:
 unit-tests:
 	@echo "Running unit tests..."
 	@( \
-		PYTHON_VERSION=`python3 -V 2>&1 | sed 's/[^0-9]*//g' | cut -c 1,2`; \
-		PYTHON_VERSION_IS_CORRECT=`cat code-env/python/desc.json | python3 -c "import sys, json; print(str($$PYTHON_VERSION) in [x[-2:] for x in json.load(sys.stdin)['acceptedPythonInterpreters']]);"`; \
+		PYTHON_VERSION=`python3 -c "import sys; print('PYTHON{}{}'.format(sys.version_info.major, sys.version_info.minor))"`; \
+		PYTHON_VERSION_IS_CORRECT=`cat code-env/python/desc.json | python3 -c "import sys, json; print('$$PYTHON_VERSION' in json.load(sys.stdin)['acceptedPythonInterpreters']);"`; \
 		if [ $$PYTHON_VERSION_IS_CORRECT == "False" ]; then echo "Python version $$PYTHON_VERSION is not in acceptedPythonInterpreters"; exit 1; else echo "Python version $$PYTHON_VERSION is in acceptedPythonInterpreters"; fi; \
 	)
 	@( \

diff --git a/code-env/python/desc.json b/code-env/python/desc.json
@@ -2,8 +2,13 @@
     "acceptedPythonInterpreters": [
         "PYTHON35",
         "PYTHON36",
-        "PYTHON37"
+        "PYTHON37",
+        "PYTHON38",
+        "PYTHON39",
+        "PYTHON310",
+        "PYTHON311"
     ],
+    "corePackagesSet": "AUTO",
     "forceConda": false,
     "installCorePackages": true,
     "installJupyterSupport": false

diff --git a/plugin.json b/plugin.json
@@ -1,6 +1,6 @@
 {
     "id": "sharepoint-online",
-    "version": "1.0.13",
+    "version": "1.0.14",
     "meta": {
         "label": "SharePoint Online",
         "description": "Read and write data from/to your SharePoint Online account",

diff --git a/python-connectors/sharepoint-online_lists/connector.py b/python-connectors/sharepoint-online_lists/connector.py
@@ -16,7 +16,7 @@ class SharePointListsConnector(Connector):
 
     def __init__(self, config, plugin_config):
         Connector.__init__(self, config, plugin_config)
-        logger.info('SharePoint Online plugin connector v1.0.13')
+        logger.info('SharePoint Online plugin connector v1.0.14')
         self.sharepoint_list_title = self.config.get("sharepoint_list_title")
         self.auth_type = config.get('auth_type')
         logger.info('init:sharepoint_list_title={}, auth_type={}'.format(self.sharepoint_list_title, self.auth_type))

diff --git a/python-fs-providers/sharepoint-online_shared-documents/fs-provider.py b/python-fs-providers/sharepoint-online_shared-documents/fs-provider.py
@@ -31,7 +31,7 @@ def __init__(self, root, config, plugin_config):
             root = root[1:]
         self.root = root
         self.provider_root = "/"
-        logger.info('SharePoint Online plugin fs v1.0.13')
+        logger.info('SharePoint Online plugin fs v1.0.14')
         logger.info('init:root={}'.format(self.root))
 
         self.client = SharePointClient(config)

diff --git a/tests/python/integration/requirements.txt b/tests/python/integration/requirements.txt
@@ -1,3 +1,4 @@
-pytest==6.2.1
+pytest
+requests<2.22,>=2
 dataiku-api-client
-git+git://github.com/dataiku/dataiku-plugin-tests-utils.git@master#egg=dataiku-plugin-tests-utils
+git+https://github.com/dataiku/dataiku-plugin-tests-utils.git@master#egg=dataiku-plugin-tests-utils
diff --git a/tests/python/unit/requirements.txt b/tests/python/unit/requirements.txt
@@ -1,2 +1,2 @@
-pytest==6.2.1
-allure-pytest==2.8.29
+pytest~=6.2
+allure-pytest~=2.8