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.

Sign up for GitHub

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

Jump to bottom

Pin urllib3 #132

Merged
merged 1 commit into from
May 4, 2023
Merged

Pin urllib3 #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@ test:

pyenv:
echo pytest_pg > .python-version && pyenv install -s 3.10.0 && pyenv virtualenv -f 3.10.0 pytest_pg

pyenv-delete:
pyenv virtualenv-delete -f pytest_pg
4 changes: 1 addition & 3 deletions pytest_pg/fixtures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,7 @@ def run_pg(image: str, ready_timeout: float = 30.0) -> Generator[PG, None, None]
time.sleep(0.5)
else:
container_logs = docker_client.logs(container["Id"]).decode()
pytest.fail(
f"Failed to start postgres using {image} in {ready_timeout} seconds: {container_logs}"
)
pytest.fail(f"Failed to start postgres using {image} in {ready_timeout} seconds: {container_logs}")

yield PG(
host=LOCALHOST,
Expand Down
1 change: 1 addition & 0 deletions requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ wheel==0.40.0
twine==4.0.2
docker==6.0.1
mypy==1.2.0
urllib3>=1.26.0,<2.0.0
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
install_requires = [
"docker>=5.0.0",
"pytest>=6.0.0",
"urllib3>=1.26.0,<2.0.0",
]


Expand Down