Merge branch 'master' into release/1.2.0

Author: alexbourret

CHANGELOG.md

@@ -7,7 +7,6 @@
 - dku_error column kept at all time in API-Connect recipe output schema
 - Updated code-env descriptor for DSS 12
 
-
 ## [Version 1.1.4](https://github.com/dataiku/dss-plugin-api-connect/releases/tag/v1.1.4) - Feature and bugfix release - 2023-02-28
 
 - Add Brotli compression

LICENSE

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

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; \
 	)
 	@( \

code-env/python/desc.json

@@ -1,8 +1,13 @@
 {
     "acceptedPythonInterpreters": [
         "PYTHON36",
-        "PYTHON37"
+        "PYTHON37",
+        "PYTHON38",
+        "PYTHON39",
+        "PYTHON310",
+        "PYTHON311"
     ],
+    "corePackagesSet": "AUTO",
     "forceConda": false,
     "installCorePackages": true,
     "installJupyterSupport": false

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

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