diff --git a/.github/workflows/build-python-wrapper/action.yml b/.github/workflows/build-python-wrapper/action.yml index 30c6db89ce..4b960a458a 100644 --- a/.github/workflows/build-python-wrapper/action.yml +++ b/.github/workflows/build-python-wrapper/action.yml @@ -65,6 +65,5 @@ runs: source "$HOME/.cargo/env" python3 -m venv .env source .env/bin/activate - python3 -m pip install --no-cache-dir -r requirements.txt python3 -m pip install --no-cache-dir -r dev_requirements.txt maturin develop diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index a1adf05cfe..699033cf1a 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -115,7 +115,6 @@ jobs: working-directory: ./python run: | source .env/bin/activate - pip install -r requirements.txt pip install -r dev_requirements.txt cd python/tests/ pytest --asyncio-mode=auto --html=pytest_report.html --self-contained-html @@ -179,7 +178,6 @@ jobs: working-directory: ./python run: | source .env/bin/activate - pip install -r requirements.txt pip install -r dev_requirements.txt cd python/tests/ pytest --asyncio-mode=auto -k test_pubsub --html=pytest_report.html --self-contained-html diff --git a/python/DEVELOPER.md b/python/DEVELOPER.md index ae945b5835..02b4ee3001 100644 --- a/python/DEVELOPER.md +++ b/python/DEVELOPER.md @@ -108,7 +108,7 @@ protoc -Iprotobuf=${GLIDE_ROOT}/glide-core/src/protobuf/ \ cd python python3 -m venv .env source .env/bin/activate -pip install -r requirements.txt +pip install -r dev_requirements.txt ``` ## Build the package (in release mode): @@ -210,7 +210,7 @@ Run from the main `/python` folder ```bash cd $HOME/src/valkey-glide/python source .env/bin/activate - pip install -r requirements.txt + pip install -r dev_requirements.txt isort . --profile black --skip-glob python/glide/protobuf --skip-glob .env black . --exclude python/glide/protobuf --exclude .env flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics \ diff --git a/python/pyproject.toml b/python/pyproject.toml index eda29f3e8e..a857f64fed 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -7,7 +7,7 @@ name = "valkey-glide" requires-python = ">=3.9" dependencies = [ # Note: If you add a dependency here, make sure to also add it to requirements.txt - # This is necessary until the issue https://github.com/aboutcode-org/python-inspector/issues/197 is resolved. + # Once issue https://github.com/aboutcode-org/python-inspector/issues/197 is resolved, the requirements.txt file can be removed.``` "async-timeout>=4.0.2; python_version < '3.11'", "typing-extensions>=4.8.0; python_version < '3.11'", "protobuf>=3.20", diff --git a/python/requirements.txt b/python/requirements.txt index 847d44dc77..c69ec6dc52 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -1,5 +1,5 @@ -# Note: If you add a dependency here, make sure to also add it to pyproject.toml -# This is necessary until the issue https://github.com/aboutcode-org/python-inspector/issues/197 is resolved. +# Note: The main location for tracking dependencies is pyproject.toml. This file is used only for the ORT process. When adding a dependency, make sure to add it both to this file and to pyproject.toml. +# Once issue https://github.com/aboutcode-org/python-inspector/issues/197 is resolved, this file can be removed. async-timeout>=4.0.2 typing-extensions>=4.8.0 -protobuf>=3.20 \ No newline at end of file +protobuf>=3.20 diff --git a/utils/get_licenses_from_ort.py b/utils/get_licenses_from_ort.py index 2432d0bc52..4f9eed96ae 100644 --- a/utils/get_licenses_from_ort.py +++ b/utils/get_licenses_from_ort.py @@ -38,6 +38,8 @@ "Unicode-3.0", "(Apache-2.0 OR MIT) AND Unicode-3.0" ] + +# Packages with non-pre-approved licenses that received manual approval. APPROVED_PACKAGES = [ "PyPI::pathspec:0.12.1", "PyPI::certifi:2023.11.17"