From 1ee72e1b0edeae15d6c6435f11c921c65cca2135 Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Sun, 6 Feb 2022 08:06:17 +0300 Subject: [PATCH 1/6] use a real python 3.5 to generate frozen reqs --- requirements.d/development.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/requirements.d/development.txt b/requirements.d/development.txt index 7a60af9822..b41c80c512 100644 --- a/requirements.d/development.txt +++ b/requirements.d/development.txt @@ -1,11 +1,11 @@ -setuptools !=60.6.0, !=60.7.0 -setuptools_scm -pip -virtualenv -tox -pytest -pytest-xdist -pytest-cov -pytest-benchmark -Cython -twine +setuptools==28.8.0 +setuptools-scm==5.0.2 +pip==20.3.4 +virtualenv==20.13.1 +tox==3.24.5 +pytest==6.1.2 +pytest-xdist==2.2.1 +pytest-cov==2.12.1 +pytest-benchmark==3.4.1 +Cython==0.29.27 +twine==1.15.0 From 85d59fe0f55c75a6b486d8dd549627799ab7f16c Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Sun, 6 Feb 2022 23:29:58 +0300 Subject: [PATCH 2/6] use pip -U -r requirements.d/development.txt --- requirements.d/development.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.d/development.txt b/requirements.d/development.txt index b41c80c512..518929934e 100644 --- a/requirements.d/development.txt +++ b/requirements.d/development.txt @@ -1,4 +1,4 @@ -setuptools==28.8.0 +setuptools==50.3.2 setuptools-scm==5.0.2 pip==20.3.4 virtualenv==20.13.1 From 8eeb32b165971936f1e6d08971b861ea91399ed1 Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Sun, 6 Feb 2022 23:40:28 +0300 Subject: [PATCH 3/6] try pytest==6.1.1 --- requirements.d/development.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.d/development.txt b/requirements.d/development.txt index 518929934e..22212bd361 100644 --- a/requirements.d/development.txt +++ b/requirements.d/development.txt @@ -3,7 +3,7 @@ setuptools-scm==5.0.2 pip==20.3.4 virtualenv==20.13.1 tox==3.24.5 -pytest==6.1.2 +pytest==6.1.1 pytest-xdist==2.2.1 pytest-cov==2.12.1 pytest-benchmark==3.4.1 From b0746a44ea189ea91a588f73d748783cf1d8e0db Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Sun, 6 Feb 2022 23:45:35 +0300 Subject: [PATCH 4/6] cp requirements.d/development.lock.txt requirements.d/development.txt --- requirements.d/development.txt | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/requirements.d/development.txt b/requirements.d/development.txt index 22212bd361..1724d23613 100644 --- a/requirements.d/development.txt +++ b/requirements.d/development.txt @@ -1,11 +1,13 @@ -setuptools==50.3.2 -setuptools-scm==5.0.2 -pip==20.3.4 -virtualenv==20.13.1 -tox==3.24.5 +setuptools==50.3.0 +setuptools-scm==4.1.2 +pip==20.2.3 +virtualenv==20.0.33 +importlib-metadata==1.7.0 +pluggy==0.13.1 +tox==3.20.0 pytest==6.1.1 -pytest-xdist==2.2.1 -pytest-cov==2.12.1 -pytest-benchmark==3.4.1 -Cython==0.29.27 +pytest-xdist==2.1.0 +pytest-cov==2.10.1 +pytest-benchmark==3.2.3 +Cython==0.29.23 twine==1.15.0 From 1d36773b298cbfe61e50ca661a1a0f6d13b31c02 Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Mon, 7 Feb 2022 00:14:25 +0300 Subject: [PATCH 5/6] Unlock pytest on python3.10 --- requirements.d/development.txt | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/requirements.d/development.txt b/requirements.d/development.txt index 1724d23613..462afa577c 100644 --- a/requirements.d/development.txt +++ b/requirements.d/development.txt @@ -1,13 +1,11 @@ -setuptools==50.3.0 -setuptools-scm==4.1.2 -pip==20.2.3 -virtualenv==20.0.33 -importlib-metadata==1.7.0 -pluggy==0.13.1 -tox==3.20.0 -pytest==6.1.1 -pytest-xdist==2.1.0 -pytest-cov==2.10.1 -pytest-benchmark==3.2.3 -Cython==0.29.23 +setuptools==50.3.2 +setuptools-scm==5.0.2 +pip==20.3.4 +virtualenv==20.13.1 +tox==3.24.5 +pytest==6.1.2; python_version < '3.10' +pytest-xdist==2.2.1 +pytest-cov==2.12.1 +pytest-benchmark==3.4.1 +Cython==0.29.27 twine==1.15.0 From 30a79d986ae17f92b97bd9596b4356dd92b3ab35 Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Mon, 7 Feb 2022 00:26:22 +0300 Subject: [PATCH 6/6] Update development.lock.txt and restore development.txt --- requirements.d/development.lock.txt | 22 ++++++++++------------ requirements.d/development.txt | 22 +++++++++++----------- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/requirements.d/development.lock.txt b/requirements.d/development.lock.txt index 1724d23613..462afa577c 100644 --- a/requirements.d/development.lock.txt +++ b/requirements.d/development.lock.txt @@ -1,13 +1,11 @@ -setuptools==50.3.0 -setuptools-scm==4.1.2 -pip==20.2.3 -virtualenv==20.0.33 -importlib-metadata==1.7.0 -pluggy==0.13.1 -tox==3.20.0 -pytest==6.1.1 -pytest-xdist==2.1.0 -pytest-cov==2.10.1 -pytest-benchmark==3.2.3 -Cython==0.29.23 +setuptools==50.3.2 +setuptools-scm==5.0.2 +pip==20.3.4 +virtualenv==20.13.1 +tox==3.24.5 +pytest==6.1.2; python_version < '3.10' +pytest-xdist==2.2.1 +pytest-cov==2.12.1 +pytest-benchmark==3.4.1 +Cython==0.29.27 twine==1.15.0 diff --git a/requirements.d/development.txt b/requirements.d/development.txt index 462afa577c..7a60af9822 100644 --- a/requirements.d/development.txt +++ b/requirements.d/development.txt @@ -1,11 +1,11 @@ -setuptools==50.3.2 -setuptools-scm==5.0.2 -pip==20.3.4 -virtualenv==20.13.1 -tox==3.24.5 -pytest==6.1.2; python_version < '3.10' -pytest-xdist==2.2.1 -pytest-cov==2.12.1 -pytest-benchmark==3.4.1 -Cython==0.29.27 -twine==1.15.0 +setuptools !=60.6.0, !=60.7.0 +setuptools_scm +pip +virtualenv +tox +pytest +pytest-xdist +pytest-cov +pytest-benchmark +Cython +twine