From db9f63e8c87fe40802cd6421261a2dbd0fee8c1d Mon Sep 17 00:00:00 2001 From: Alexandre Bourret Date: Tue, 18 Apr 2023 13:35:12 +0200 Subject: [PATCH 1/7] sharepoint online DSS12 update [sc-132150] --- code-env/python/desc.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code-env/python/desc.json b/code-env/python/desc.json index 11b048a..9b6620b 100644 --- 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 From bd865427a5fc833db7f342057ce1fcc16d968d55 Mon Sep 17 00:00:00 2001 From: Alexandre Bourret Date: Tue, 18 Apr 2023 13:35:25 +0200 Subject: [PATCH 2/7] changelog update --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ddb65a7..7433f87 100644 --- 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 From 4d742d15c30f8bde80b79145f877cce15620a284 Mon Sep 17 00:00:00 2001 From: Alexandre Bourret Date: Tue, 18 Apr 2023 13:35:32 +0200 Subject: [PATCH 3/7] license update --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 06693a4..af63f67 100644 --- 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. From 9c1b91837b7afcd116ed53835c729138fd04ecb5 Mon Sep 17 00:00:00 2001 From: Alexandre Bourret Date: Tue, 18 Apr 2023 13:37:41 +0200 Subject: [PATCH 4/7] Version update --- plugin.json | 2 +- python-connectors/sharepoint-online_lists/connector.py | 2 +- .../sharepoint-online_shared-documents/fs-provider.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugin.json b/plugin.json index 81639b8..321795d 100644 --- 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 index fa23764..e42d7bc 100644 --- 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 index 81bb66d..3433733 100644 --- 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) From 14d602146df43c0884d0279fb19bfe74cc96c1c8 Mon Sep 17 00:00:00 2001 From: Alexandre Bourret Date: Tue, 25 Apr 2023 14:52:16 +0200 Subject: [PATCH 5/7] Makefile in line with plugin template --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e1031d1..f9550d6 100644 --- 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; \ ) @( \ From b9e315d8d4b6ee760b3ec208508578a0d0bdc94b Mon Sep 17 00:00:00 2001 From: Alexandre Bourret Date: Tue, 25 Apr 2023 14:52:30 +0200 Subject: [PATCH 6/7] Update integration test requirements --- tests/python/integration/requirements.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/python/integration/requirements.txt b/tests/python/integration/requirements.txt index cac3188..c4bfc3c 100755 --- 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 \ No newline at end of file From 26d3ad41ddd9362130bbbff1adb3a60d0fd1b6d5 Mon Sep 17 00:00:00 2001 From: Alexandre Bourret Date: Tue, 25 Apr 2023 15:10:47 +0200 Subject: [PATCH 7/7] Requirements update for unit tests --- tests/python/unit/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/python/unit/requirements.txt b/tests/python/unit/requirements.txt index 8f93c18..4c2ebf7 100644 --- 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 \ No newline at end of file +pytest~=6.2 +allure-pytest~=2.8 \ No newline at end of file