From cbade19187d233f166003cda1ceb71f75358ea19 Mon Sep 17 00:00:00 2001 From: Mikhail Ryzhov Date: Mon, 4 Dec 2023 11:26:58 +0100 Subject: [PATCH] fixed windows py version + reverted toml conf --- .ci/azure/windows.yml | 6 +++--- modules/custom_operations/pyproject.toml | 19 ++++++++----------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.ci/azure/windows.yml b/.ci/azure/windows.yml index 190522549..89cee86e3 100644 --- a/.ci/azure/windows.yml +++ b/.ci/azure/windows.yml @@ -99,7 +99,7 @@ jobs: powershell -command "Expand-Archive -Force ninja-win.zip" powershell -command "Invoke-WebRequest https://services.gradle.org/distributions/gradle-$(GRADLE_VER)-bin.zip -OutFile gradle-$(GRADLE_VER)-bin.zip" powershell -command "Expand-Archive -Force gradle-$(GRADLE_VER)-bin.zip" - call "$(SETUPVARS)" + call $(SETUPVARS) $(PYTHON_EXE) -m pip install --upgrade pip $(PYTHON_EXE) -m pip install -r $(OPENVINO_REPO_DIR)\src\bindings\python\src\compatibility\openvino\requirements-dev.txt $(PYTHON_EXE) -m pip install -r $(OPENVINO_REPO_DIR)\src\bindings\python\requirements.txt @@ -154,7 +154,7 @@ jobs: - script: | set PATH=$(WORK_DIR)\ninja-win;%PATH% set OpenCV_DIR=C:\tools\opencv\build - call "$(SETUPVARS)" + call $(SETUPVARS) -pyver 3.8 call "$(MSVS_VARS_PATH)" cmake -GNinja ^ -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) ^ @@ -185,7 +185,7 @@ jobs: - script: | call $(SETUPVARS) -pyver 3.8 && ^ - $(PYTHON_EXE) -m pytest tokenizers_test.py + $(PYTHON_EXE) -m pytest --tb=no tokenizers_test.py continue-on-error: true workingDirectory: $(REPO_DIR)\modules\custom_operations\user_ie_extensions\tokenizer\python\tests displayName: 'Tokenizers extension regression test' diff --git a/modules/custom_operations/pyproject.toml b/modules/custom_operations/pyproject.toml index 416bc6ccf..402644222 100644 --- a/modules/custom_operations/pyproject.toml +++ b/modules/custom_operations/pyproject.toml @@ -6,6 +6,7 @@ requires-python = ">=3.8" authors = [ { name = "OpenVINO Developers", email = "openvino@intel.com" }, ] + classifiers = [ 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', @@ -14,29 +15,25 @@ classifiers = [ ] dependencies = [ - "openvino>=2023.1", + "openvino", "numpy" ] [project.optional-dependencies] dev = [ - "black", "ruff", "pytest", ] transformers = [ - "transformers[sentencepiece]" + "transformers[sentencepiece,tiktoken]" +] +tiktoken = [ + "tiktoken" ] all = [ - "ov_tokenizer[dev,transformers]" + "ov_tokenizer[dev,transformers,tiktoken]" ] - -[tool.black] -line-length = 119 -target-versions = ["py38", "py39", "py310", "py311", "py312"] - - [tool.ruff] ignore = ["C901", "E501", "E741", "W605"] select = ["C", "E", "F", "I", "W"] @@ -55,4 +52,4 @@ requires = [ "scikit-build~=0.17.0", "cmake>=3.14" ] -build-backend = "setuptools.build_meta" \ No newline at end of file +build-backend = "setuptools.build_meta"