Skip to content

Commit

Permalink
Test dependencies have been upgraded.
Browse files Browse the repository at this point in the history
The `importlib-metadata` package had to be pinned below `5.0.0` due to incompatibility with
most recent kombu. The pinning can be removing after upstream kombu has been patched.

More details here: celery/kombu#1600
  • Loading branch information
maciej-gol committed Nov 18, 2022
1 parent 7d01ffa commit 25e59e0
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 22 deletions.
2 changes: 1 addition & 1 deletion __app_run_tests
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ run_silently apt update
run_silently apt install -y libpq-dev tree

run_silently pip install -r /app/requirements.txt django ${ADDITIONAL_REQUIREMENTS}
run_silently pip install -e .
run_silently pip install -e . 'importlib-metadata<5'
pip freeze

cd test_app
Expand Down
43 changes: 24 additions & 19 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,47 +4,52 @@
#
# pip-compile requirements.in
#
attrs==21.2.0
attrs==22.1.0
# via pytest
click==8.0.3
build==0.9.0
# via pip-tools
freezegun==1.1.0
click==8.1.3
# via pip-tools
exceptiongroup==1.0.4
# via pytest
freezegun==1.2.2
# via -r requirements.in
iniconfig==1.1.1
# via pytest
more-itertools==5.0.0
# via -r requirements.in
packaging==21.2
# via pytest
pep517==0.12.0
# via pip-tools
pip-tools==6.4.0
packaging==21.3
# via
# build
# pytest
pep517==0.13.0
# via build
pip-tools==6.10.0
# via -r requirements.in
pluggy==1.0.0
# via pytest
psycopg2-binary==2.9.1
psycopg2-binary==2.9.5
# via -r requirements.in
py==1.11.0
# via pytest
pyparsing==2.4.7
pyparsing==3.0.9
# via packaging
pytest==6.2.5
pytest==7.2.0
# via
# -r requirements.in
# pytest-django
pytest-django==4.4.0
pytest-django==4.5.2
# via -r requirements.in
python-dateutil==2.8.2
# via freezegun
six==1.16.0
# via
# more-itertools
# python-dateutil
toml==0.10.2
# via pytest
tomli==1.2.2
# via pep517
wheel==0.37.0
tomli==2.0.1
# via
# build
# pep517
# pytest
wheel==0.38.4
# via pip-tools

# The following packages are considered to be unsafe in a requirements file:
Expand Down
2 changes: 1 addition & 1 deletion run-tests
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
export PYTHON_VERSION=${PYTHON_VERSION:-3.6}
export PYTHON_VERSION=${PYTHON_VERSION:-3.7}
export ADDITIONAL_REQUIREMENTS=${ADDITIONAL_REQUIREMENTS:-django-tenants}
export BROKER_URL=${BROKER_URL:-amqp://guest:guest@rabbitmq:5672/}

Expand Down
2 changes: 1 addition & 1 deletion test-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ services:
driver: "none"

app:
image: "python:${PYTHON_VERSION:-3.6}-slim"
image: "python:${PYTHON_VERSION:-3.7}-slim"
depends_on:
- postgres
- redis
Expand Down

0 comments on commit 25e59e0

Please sign in to comment.