Skip to content

Commit

Permalink
Merge pull request #3865 from Yelp/vanilla_pip
Browse files Browse the repository at this point in the history
Use vanilla pip
  • Loading branch information
ymilki authored May 16, 2024
2 parents 9ed832d + ac6d49a commit fd190f4
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 15 deletions.
7 changes: 2 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions requirements-bootstrap.txt
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions requirements-gha.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-r requirements-bootstrap.txt
coveralls
ephemeral-port-reserve
tox==3.2
tox-pip-extensions==1.3.0
tox==3.28.0
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 5 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
[tox]
skipsdist=True
envlist=py38-linux
tox_pip_extensions_ext_venv_update = true
docker_compose_version = 1.26.2
requires =
tox==3.28.0


[testenv]
basepython = python3.8
Expand All @@ -17,7 +19,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

Expand Down Expand Up @@ -145,7 +147,7 @@ deps =
commands =
# TODO: upgrade behave if they ever take this reasonable PR
pip install git+https://github.com/Yelp/[email protected]_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]
Expand Down

0 comments on commit fd190f4

Please sign in to comment.