Skip to content

Commit

Permalink
[PyOV] Remove py package (#27248) (#27474)
Browse files Browse the repository at this point in the history
- `py` package has a high CVE on it
 - it's also in maintenance mode
- there are seemingly no usages of that package in the codebase, so it
can be dropped
 - let's wait for CI results to confirm

 - CVS-156002

### Details:
 - this PR includes changes introduced by:
   - #25872;
   - #27248;
   - #25899;
   - #27232
 - *...*

### Tickets:
 - CVS-156977

---------

Co-authored-by: Przemyslaw Wysocki <przemyslaw.wysocki@intel.com>
Co-authored-by: Ilya Lavrenov <ilya.lavrenov@intel.com>
  • Loading branch information
3 people authored Nov 13, 2024
1 parent 7e6c4de commit 63b24fd
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 14 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/code_snippets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ jobs:
packages: ocl-icd-opencl-dev opencl-headers
version: 3.0

- name: Install scons
if: runner.os == 'macOS'
run: brew install scons

- name: CMake configure
run: cmake -DCMAKE_BUILD_TYPE=Release -DTHREADING=SEQ -B build

Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/job_python_unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -306,14 +306,14 @@ jobs:
path: ${{ env.OPENVINO_REPO }}
submodules: 'false'

- name: Docs Python snippets
if: runner.os != 'macOS'
run: |
# to find 'snippets' module in docs
export PYTHONPATH=${OPENVINO_REPO}/docs
# for 'template' extension
export LD_LIBRARY_PATH=${INSTALL_TEST_DIR}:$LD_LIBRARY_PATH
python3 ${OPENVINO_REPO}/docs/snippets/main.py
# - name: Docs Python snippets
# if: runner.os != 'macOS'
# run: |
# # to find 'snippets' module in docs
# export PYTHONPATH=${OPENVINO_REPO}/docs
# # for 'template' extension
# export LD_LIBRARY_PATH=${INSTALL_TEST_DIR}:$LD_LIBRARY_PATH
# python3 ${OPENVINO_REPO}/docs/snippets/main.py

- name: Upload Test Results
uses: actions/upload-artifact@v3
Expand Down
1 change: 0 additions & 1 deletion src/bindings/python/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ pytest-html==4.1.1
pytest-timeout==2.2.0

# Python bindings
py>=1.9.0
pygments>=2.8.1
setuptools>=65.6.1
sympy>=1.10
Expand Down
3 changes: 1 addition & 2 deletions src/bindings/python/requirements_test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,10 @@ pytest-forked; sys_platform != 'win32'
pytest-xdist
pytest-html
pytest
py
radon
retrying
tox
types-pkg_resources
types-setuptools
wheel
singledispatchmethod
torch
Expand Down
13 changes: 12 additions & 1 deletion src/bindings/python/wheel/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,21 @@

execute_process(COMMAND ${Python3_EXECUTABLE} -c "import wheel.vendored.packaging.tags as tags ; print(f'{tags.interpreter_name()}{tags.interpreter_version()}')"
OUTPUT_VARIABLE PYTHON_TAG OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND ${Python3_EXECUTABLE} -c "import wheel.bdist_wheel ; print(f'{wheel.bdist_wheel.get_abi_tag()}')"
if(NOT PYTHON_TAG)
message(FATAL_ERROR "Failed to detect Python Tag via wheel.vendored.packaging.tags. Please, check 'wheel' dependency version update")
endif()

execute_process(COMMAND ${Python3_EXECUTABLE} -c "from setuptools.command.bdist_wheel import get_abi_tag; print(f'{get_abi_tag()}')"
OUTPUT_VARIABLE ABI_TAG OUTPUT_STRIP_TRAILING_WHITESPACE)
if(NOT ABI_TAG)
message(FATAL_ERROR "Failed to detect ABI Tag via setuptools.command.bdist_wheel. Please, check 'setuptools' dependency version update")
endif()

execute_process(COMMAND ${Python3_EXECUTABLE} -c "import wheel.vendored.packaging.tags as tags ; print(f'{next(tags.platform_tags())}')"
OUTPUT_VARIABLE PLATFORM_TAG OUTPUT_STRIP_TRAILING_WHITESPACE)
if(NOT PLATFORM_TAG)
message(FATAL_ERROR "Failed to detect Platform Tag via wheel.vendored.packaging.tags. Please, check 'wheel' dependency version update")
endif()

# defines wheel architecture part of `PLATFORM_TAG`
macro(_ov_platform_arch)
Expand Down
3 changes: 3 additions & 0 deletions tests/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,6 @@ pytest-timeout==2.1.0
jax<=0.4.14
jaxlib<=0.4.14
torch>=1.13,<2.2
super-image==0.1.7
# huggingface-hub required for super-image
huggingface-hub==0.25.2
2 changes: 2 additions & 0 deletions tests/model_hub_tests/torch_tests/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@ torchaudio
torchvision
transformers
wheel
# huggingface-hub required for super-image
huggingface-hub
1 change: 0 additions & 1 deletion tools/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,5 @@ astroid>=2.9.0
pylint>=2.7.0
pyenchant>=3.0.0
test-generator==0.1.1
py>=1.9.0
urllib3>=1.26.4
openvino-telemetry>=2023.2.1
1 change: 0 additions & 1 deletion tools/mo/requirements_dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ test-generator
defusedxml
requests
pytest
py
fastjsonschema

0 comments on commit 63b24fd

Please sign in to comment.