From fdeabc5843aad092bb16eaf74e24fead3234dbe6 Mon Sep 17 00:00:00 2001 From: Aleksei Rubashev Date: Tue, 23 Jul 2024 11:13:02 +0300 Subject: [PATCH] ! pyyaml 5.4.1 workaround for Python 2 --- .github/workflows/commit.yml | 5 ++--- poetry.lock | 18 ++++++++++++++++-- pyproject.toml | 1 + requirements.txt | 1 + 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/.github/workflows/commit.yml b/.github/workflows/commit.yml index 4974699..d23a2c4 100644 --- a/.github/workflows/commit.yml +++ b/.github/workflows/commit.yml @@ -63,9 +63,8 @@ jobs: # PyYaml 5.4.1 requires cython < 3.0.0 for Python 2.7 - name: Install dependencies run: | - python -m pip install "cython<3.0.0" - python -m pip install --no-build-isolation pyyaml==5.4.1 - python -m pip install --no-deps -r requirements.txt + echo "cython<3" > /tmp/constraint.txt + PIP_CONSTRAINT=/tmp/constraint.txt python -m pip install --no-deps -r requirements.txt - name: Create .env run: | diff --git a/poetry.lock b/poetry.lock index 32507e2..2893da8 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.0 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand. [[package]] name = "aspy-yaml" @@ -1065,6 +1065,20 @@ platformdirs = ">=3.9.1,<5" docs = ["furo (>=2023.7.26)", "proselint (>=0.13)", "sphinx (>=7.1.2,!=7.3)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"] test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=23.1)", "pytest (>=7.4)", "pytest-env (>=0.8.2)", "pytest-freezer (>=0.4.8)", "pytest-mock (>=3.11.1)", "pytest-randomly (>=3.12)", "pytest-timeout (>=2.1)", "setuptools (>=68)", "time-machine (>=2.10)"] +[[package]] +name = "wheel" +version = "0.37.1" +description = "A built-package format for Python" +optional = false +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" +files = [ + {file = "wheel-0.37.1-py2.py3-none-any.whl", hash = "sha256:4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a"}, + {file = "wheel-0.37.1.tar.gz", hash = "sha256:e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4"}, +] + +[package.extras] +test = ["pytest (>=3.0.0)", "pytest-cov"] + [[package]] name = "zipp" version = "1.2.0" @@ -1101,4 +1115,4 @@ test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", [metadata] lock-version = "2.0" python-versions = ">=2.7.18,<3.0 || >=3.9,<4.0" -content-hash = "6d038ecd0ec7dacdf2e79241d247b2be87c4da9df7091df1f0ea3d22acf56fe7" +content-hash = "a50b20c9730d12a5872ca66649b371a9f3e68d3c22503e30cfdcf630f758fa18" diff --git a/pyproject.toml b/pyproject.toml index 84abc52..60f459e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,6 +37,7 @@ pre-commit = [ { version = "1.21.0", python = "<3" } ] ruff = { version = "0.5.4", python = ">3" } +wheel = { version = "0.37.1", python = "<3" } [[tool.poetry.source]] name = "pypi" diff --git a/requirements.txt b/requirements.txt index 77815dc..b5b858a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -56,5 +56,6 @@ urllib3==1.26.19 ; python_full_version >= "2.7.18" and python_version < "3.0.dev urllib3==2.2.2 ; python_version >= "3.9" and python_version < "4.0" virtualenv==20.15.1 ; python_full_version >= "2.7.18" and python_version < "3.0.dev0" virtualenv==20.26.3 ; python_version >= "3.9" and python_version < "4.0" +wheel==0.37.1 ; python_full_version >= "2.7.18" and python_version < "3.0.dev0" zipp==1.2.0 ; python_full_version >= "2.7.18" and python_version < "3.0.dev0" zipp==3.19.2 ; python_version >= "3.9" and python_version < "3.10"