Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade all dependencies #22

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,8 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: 3.7
- run: python -m pip install --upgrade pip
- run: pip install coveralls tox==3.2 tox-pip-extensions==1.3.0 ephemeral-port-reserve
python-version: '3.10'
- run: pip install -U -r requirements-bootstrap.txt
- run: tox -e ${{ matrix.toxenv }}
k8s_itests:
runs-on: ubuntu-20.04
Expand All @@ -40,11 +39,9 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: 3.7
- run: python -m pip install --upgrade pip virtualenv
python-version: '3.10'
- run: pip install -U -r requirements-bootstrap.txt
- run: curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/
- run: python -m pip install --upgrade pip
- run: pip install coveralls tox==3.2 tox-pip-extensions==1.3.0 ephemeral-port-reserve
- run: make k8s_itests
build_debs:
runs-on: ubuntu-20.04
Expand All @@ -56,7 +53,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: 3.7
python-version: '3.10'
- run: sudo apt-get update
- run: sudo apt-get install -yq devscripts
- run: make itest_${{ matrix.dist }}
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ jobs:
- uses: actions/setup-python@v2
with:
python-version: 3.7
- run: python -m pip install --upgrade pip
- run: pip install coveralls tox==3.2 tox-pip-extensions==1.3.0 ephemeral-port-reserve
- run: pip install -U -r requirements-bootstrap.txt
- run: tox -e ${{ matrix.toxenv }}
pypi:
# lets run tests before we push anything to pypi, much like we do internally
Expand Down
6 changes: 1 addition & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,7 @@ 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 -U -r requirements-bootstrap.txt
touch .paasta/bin/activate

itest: test .paasta/bin/activate
Expand Down
2 changes: 1 addition & 1 deletion k8s_itests/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ ifeq (,$(wildcard ./kind))
endif

itest: .create_cluster
../.paasta/bin/tox -e k8s_itests
tox -e k8s_itests

clean:
./scripts/clean.sh $(PAASTA_CONFIG_DIR) $(CLUSTER) 2>/dev/null || true
10 changes: 6 additions & 4 deletions requirements-bootstrap.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
pip==18.1
setuptools==39.0.1
venv-update==3.2.4
wheel==0.32.3
ephemeral-port-reserve==1.1.4
pip==22.0.4
setuptools==69.1.0
tox==3.7.0
tox-pip-extensions==1.4.2
virtualenv==16.2.0
95 changes: 47 additions & 48 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,53 +1,52 @@
alabaster==0.7.10
appdirs==1.4.4
astroid==2.4.2
asynctest==0.12.0
Babel==2.9.1
cfgv==2.0.1
coverage==6.5.0
debugpy==1.8.0
distlib==0.3.4
docutils==0.12
exceptiongroup==1.1.2
filelock==3.0.12
flake8==3.5.0
freezegun==0.3.7
hypothesis==6.79.4
identify==2.4.12
imagesize==0.7.1
alabaster==0.7.13
astroid==2.13.3
asynctest==0.13.0
Babel==2.14.0
cfgv==3.4.0
coverage==7.4.2
debugpy==1.8.1
dill==0.3.7
distlib==0.3.8
docutils==0.19
filelock==3.13.1
flake8==7.0.0
freezegun==1.4.0
hypothesis==6.98.9
identify==2.5.35
imagesize==1.4.1
importlib-metadata==7.0.1
iniconfig==2.0.0
isort==4.2.5
lazy-object-proxy==1.4.3
mccabe==0.6.1
mock==2.0.0
nodeenv==1.1.4
packaging==20.9
path.py==8.1
pbr==3.1.1
pep8==1.5.7
pluggy==1.2.0
pre-commit==2.17.0
pycodestyle==2.3.1
pyfakefs==4.1.0
pyflakes==1.6.0
Pygments==2.7.4
pylint==2.6.0
pyparsing==2.4.7
pytest==7.4.0
pytest-asyncio==0.21.1
requirements-tools==1.1.2
snowballstemmer==1.2.0
isort==5.13.2
lazy-object-proxy==1.10.0
mccabe==0.7.0
mock==5.1.0
nodeenv==1.8.0
path==16.4.0
path.py==12.5.0
pep8==1.7.1
pluggy==1.4.0
pre-commit==3.5.0
pycodestyle==2.11.1
pyfakefs==5.3.5
pyflakes==3.2.0
pygments==2.17.2
pylint==2.15.10
pytest==8.0.1
pytest-asyncio==0.23.5
requirements-tools==2.1.0
snowballstemmer==2.2.0
sortedcontainers==2.4.0
Sphinx==2.2.0
sphinx-rtd-theme==1.0.0
sphinxcontrib-applehelp==1.0.1
sphinxcontrib-devhelp==1.0.1
sphinxcontrib-htmlhelp==1.0.2
sphinx==7.1.1
sphinx-rtd-theme==2.0.0
sphinxcontrib-applehelp==1.0.4
sphinxcontrib-devhelp==1.0.2
sphinxcontrib-htmlhelp==2.0.1
sphinxcontrib-jquery==4.1
sphinxcontrib-jsmath==1.0.1
sphinxcontrib-qthelp==1.0.2
sphinxcontrib-serializinghtml==1.1.3
toml==0.9.4
sphinxcontrib-qthelp==1.0.3
sphinxcontrib-serializinghtml==1.1.5
tomli==2.0.1
virtualenv==20.4.3
wrapt==1.12.1
tomlkit==0.12.3
virtualenv==20.25.0
wrapt==1.16.0
zake==0.2.2
Loading