Merge pull request #17 from dataiku/chore/update-plugin

Add python 3.8 and 3.9 support

Author: mhham

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## [Version 1.3.0](https://github.com/dataiku/dss-plugin-nlp-preparation/releases/tag/v1.3.0) - New feature - 2023-04
+- ✨ Added Python 3.8 and 3.9 support
+
 ## [Version 1.2.2](https://github.com/dataiku/dss-plugin-nlp-preparation/releases/tag/v1.2.2) - Bugfix release - 2022-07
 - Fix sudachipy version not being compatible with Python 3.6 anymore
 

LICENSE

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

Makefile

@@ -1,5 +1,3 @@
-SHELL:=/bin/bash
-
 # Makefile variables set automatically
 plugin_id=`cat plugin.json | python -c "import sys, json; print(str(json.load(sys.stdin)['id']).replace('/',''))"`
 plugin_version=`cat plugin.json | python -c "import sys, json; print(str(json.load(sys.stdin)['version']).replace('/',''))"`
@@ -9,7 +7,7 @@ last_commit_id=`git rev-parse HEAD`
 
 
 plugin:
-	@echo "Archiving plugin to dist/ folder..."
+	@echo "[START] Archiving plugin to dist/ folder..."
 	@cat plugin.json | json_pp > /dev/null
 	@rm -rf dist
 	@mkdir dist
@@ -18,38 +16,38 @@ plugin:
 	@zip --delete dist/${archive_file_name} "tests/*"
 	@zip -u dist/${archive_file_name} release_info.json
 	@rm release_info.json
-	@echo "Archiving plugin to dist/ folder: Done!"
+	@echo "[SUCCESS] Archiving plugin to dist/ folder: Done!"
 
-.ONESHELL:
 unit-tests:
-	@set -e
 	@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']]);"`
-	@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
-	@rm -rf ./env/
-	@python3 -m venv env/
-	@source env/bin/activate
-	@pip install --upgrade pip
-	@pip install --no-cache-dir -r tests/python/unit/requirements.txt
-	@pip install --no-cache-dir -r code-env/python/spec/requirements.txt
-	@export PYTHONPATH="$(PYTHONPATH):$(PWD)/python-lib"
-	@export DICTIONARY_FOLDER_PATH="$(PWD)/resource/dictionaries"
-	@export STOPWORDS_FOLDER_PATH="$(PWD)/resource/stopwords"
-	@pytest tests/python/unit --alluredir=tests/allure_report
-	@echo "Running unit tests: Done!"
+	@( \
+		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; \
+	)
+	@( \
+		rm -rf ./env/; \
+		python3 -m venv env/; \
+		source env/bin/activate; \
+		pip install --upgrade pip;\
+		pip install --no-cache-dir -r tests/python/unit/requirements.txt; \
+		pip install --no-cache-dir -r code-env/python/spec/requirements.txt; \
+		export PYTHONPATH="$(PYTHONPATH):$(PWD)/python-lib"; \
+		export DICTIONARY_FOLDER_PATH="$(PWD)/resource/dictionaries"; \
+		export STOPWORDS_FOLDER_PATH="$(PWD)/resource/stopwords"; \
+		pytest tests/python/unit --alluredir=tests/allure_report || ret=$$?; exit $$ret \
+	)
 
-.ONESHELL:
 integration-tests:
-	@set -e
 	@echo "Running integration tests..."
-	@rm -rf ./env/
-	@python3 -m venv env/
-	@source env/bin/activate
-	@pip install --upgrade pip
-	@pip install --no-cache-dir -r tests/python/integration/requirements.txt
-	@pytest tests/python/integration --alluredir=tests/allure_report
-	@echo "Running integration tests: Done!"
+	@( \
+		rm -rf ./env/; \
+		python3 -m venv env/; \
+		source env/bin/activate; \
+		pip3 install --upgrade pip;\
+		pip install --no-cache-dir -r tests/python/integration/requirements.txt; \
+		pytest tests/python/integration --alluredir=tests/allure_report || ret=$$?; exit $$ret \
+	)
 
 tests: unit-tests integration-tests
 

code-env/python/desc.json

@@ -1,9 +1,12 @@
 {
     "acceptedPythonInterpreters": [
         "PYTHON36",
-        "PYTHON37"
+        "PYTHON37",
+        "PYTHON38",
+        "PYTHON39"
     ],
     "forceConda": false,
     "installCorePackages": true,
+    "corePackagesSet": "AUTO",
     "installJupyterSupport": true
 }

plugin.json

@@ -1,6 +1,6 @@
 {
     "id": "nlp-preparation",
-    "version": "1.2.2",
+    "version": "1.3.0",
     "meta": {
         "label": "Text Preparation",
         "category": "Natural Language Processing",

tests/python/integration/requirements.txt

@@ -1,4 +1,4 @@
-pandas>=1.0,<1.1
-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