From a0db886e89c9a6046d8d508a2ff19c1334abcde3 Mon Sep 17 00:00:00 2001 From: Jonathan Chu Date: Mon, 13 May 2024 14:35:40 -0700 Subject: [PATCH 1/9] F Use bootstrap deps for `.paasta` venv --- Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index c0be5d41d0..02fc1c437b 100644 --- a/Makefile +++ b/Makefile @@ -68,11 +68,8 @@ dev-api: .tox/py38-linux .paasta/bin/activate: requirements.txt requirements-dev.txt test -d .paasta/bin/activate || virtualenv -p python3.8 .paasta - .paasta/bin/pip install -U \ - pip==18.1 \ - virtualenv==16.2.0 \ - tox==3.7.0 \ - tox-pip-extensions==1.4.2 + .paasta/bin/pip install -r requirements-bootstrap.txt + .paasta/bin/pip install -U tox==3.28.0 touch .paasta/bin/activate itest: test .paasta/bin/activate From 7a723a6f98bff410c4a44fb165cadf783b456477 Mon Sep 17 00:00:00 2001 From: Jonathan Chu Date: Mon, 13 May 2024 16:20:24 -0700 Subject: [PATCH 2/9] F Remove `venv-update` --- requirements-gha.txt | 1 - tox.ini | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/requirements-gha.txt b/requirements-gha.txt index c3ae9ffbd4..9c9957cdff 100644 --- a/requirements-gha.txt +++ b/requirements-gha.txt @@ -1,4 +1,3 @@ coveralls ephemeral-port-reserve tox==3.2 -tox-pip-extensions==1.3.0 diff --git a/tox.ini b/tox.ini index 0e444e5190..a74a9abad9 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,6 @@ [tox] skipsdist=True envlist=py38-linux -tox_pip_extensions_ext_venv_update = true docker_compose_version = 1.26.2 [testenv] @@ -17,7 +16,7 @@ commands = # these are only available at yelp so we optionally install them so that internal devs don't need to # manually do so (through pip or make) # that said, most of the time people will run make test which will use tox to install these in a - # faster way (using venv-update) - so this is really just here for anyone that like to just invoke + # faster way - so this is really just here for anyone that like to just invoke # `tox` directly and with no explicit env -pip install -r yelp_package/extra_requirements_yelp.txt From a874823e7ff871793b917ddfec228aa2d2549db5 Mon Sep 17 00:00:00 2001 From: Jonathan Chu Date: Mon, 13 May 2024 17:12:47 -0700 Subject: [PATCH 3/9] F Clarify path in pylint invocation --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index a74a9abad9..3613a2e6ba 100644 --- a/tox.ini +++ b/tox.ini @@ -144,7 +144,7 @@ deps = commands = # TODO: upgrade behave if they ever take this reasonable PR pip install git+https://github.com/Yelp/behave@1.2.5-issue_533-fork - pylint -E paasta_tools/mesos/ --ignore master.py,task.py + pylint -E {toxinidir}/paasta_tools/mesos/ --ignore master.py,task.py behave {posargs} [testenv:mypy] From e87d9b206e95215813679bf837e367e12c76c9b1 Mon Sep 17 00:00:00 2001 From: Jonathan Chu Date: Mon, 13 May 2024 13:29:24 -0700 Subject: [PATCH 4/9] F Update bootstrap deps --- requirements-bootstrap.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/requirements-bootstrap.txt b/requirements-bootstrap.txt index b24f00fb9b..757a8c7af7 100644 --- a/requirements-bootstrap.txt +++ b/requirements-bootstrap.txt @@ -1,4 +1,3 @@ -pip==18.1 -setuptools==39.0.1 -venv-update==3.2.4 -wheel==0.32.3 +pip==24.0 +setuptools==68.0.0 +wheel==0.42.0 From b2770282204d5c3278d167ccaf390fff61050b88 Mon Sep 17 00:00:00 2001 From: Jonathan Chu Date: Mon, 13 May 2024 16:54:09 -0700 Subject: [PATCH 5/9] F Update `isodate` * `isodate==0.6.0` removes `2to3`, which was removed from `setuptools>=58.0.0` --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 371791d8ee..c23087877f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -35,7 +35,7 @@ hupper==1.0 idna==2.6 inotify==0.2.8 ipaddress==1.0.22 -isodate==0.5.1 +isodate==0.6.0 itsdangerous==2.0.1 Jinja2==2.11.3 jinja2-time==0.1.0 From 599010e0aea23444979ff291aa544eb7bcf499ce Mon Sep 17 00:00:00 2001 From: Jonathan Chu Date: Mon, 13 May 2024 16:20:43 -0700 Subject: [PATCH 6/9] F Pin `tox` --- requirements-gha.txt | 2 +- tox.ini | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/requirements-gha.txt b/requirements-gha.txt index 9c9957cdff..8ac5bb93ab 100644 --- a/requirements-gha.txt +++ b/requirements-gha.txt @@ -1,3 +1,3 @@ coveralls ephemeral-port-reserve -tox==3.2 +tox==3.28.0 diff --git a/tox.ini b/tox.ini index 3613a2e6ba..7c38a7791f 100644 --- a/tox.ini +++ b/tox.ini @@ -2,6 +2,9 @@ skipsdist=True envlist=py38-linux docker_compose_version = 1.26.2 +requires = + tox==3.28.0 + [testenv] basepython = python3.8 From 32855d8c0ed71507469a422ff6ea4bd6894070ab Mon Sep 17 00:00:00 2001 From: Jonathan Chu Date: Mon, 13 May 2024 16:21:13 -0700 Subject: [PATCH 7/9] F Ensure tox bootstrap dir is unchanged --- tox.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tox.ini b/tox.ini index 7c38a7791f..1ba980cb5f 100644 --- a/tox.ini +++ b/tox.ini @@ -186,3 +186,6 @@ extend-ignore = E501,E203,W503 [pep8] ignore = E265,E501 + +[testenv:.tox] +envdir = {toxworkdir}/{envname} From b9f12e32e006e4fb738d52baacd9e9dc5740ab42 Mon Sep 17 00:00:00 2001 From: Jonathan Chu Date: Mon, 13 May 2024 16:34:24 -0700 Subject: [PATCH 8/9] F Ensure GHA installs bootstrap deps --- requirements-gha.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements-gha.txt b/requirements-gha.txt index 8ac5bb93ab..a2bafeac59 100644 --- a/requirements-gha.txt +++ b/requirements-gha.txt @@ -1,3 +1,4 @@ +-r requirements-bootstrap.txt coveralls ephemeral-port-reserve tox==3.28.0 From ac6d49a9387149932b022b018bca49a5ffd08232 Mon Sep 17 00:00:00 2001 From: Jonathan Chu Date: Tue, 14 May 2024 15:41:56 -0700 Subject: [PATCH 9/9] Revert "F Ensure tox bootstrap dir is unchanged" This reverts commit 32855d8c0ed71507469a422ff6ea4bd6894070ab. --- tox.ini | 3 --- 1 file changed, 3 deletions(-) diff --git a/tox.ini b/tox.ini index 1ba980cb5f..7c38a7791f 100644 --- a/tox.ini +++ b/tox.ini @@ -186,6 +186,3 @@ extend-ignore = E501,E203,W503 [pep8] ignore = E265,E501 - -[testenv:.tox] -envdir = {toxworkdir}/{envname}