Skip to content

Commit

Permalink
chore: update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
NilsOveTen committed Nov 9, 2023
1 parent 4269298 commit bc186ea
Show file tree
Hide file tree
Showing 8 changed files with 602 additions and 609 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/constraints.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pip==23.1.2
pip==23.3.1
nox==2023.4.22
nox-poetry==1.0.2
poetry==1.5.1
virtualenv==20.23.0
nox-poetry==1.0.3
poetry==1.7.0
virtualenv==20.24.6
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

WORKDIR /app

RUN pip install "poetry==1.5.1"
RUN pip install "poetry==1.7.0"
COPY poetry.lock pyproject.toml /app/

# Project initialization:
Expand Down
1,149 changes: 571 additions & 578 deletions poetry.lock

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,36 +15,36 @@ classifiers=[

[tool.poetry.dependencies]
python = "^3.9"
gunicorn = "^20.1.0"
gunicorn = "^21.2.0"
python-dotenv = "^1.0.0"
requests = "^2.31.0"
aiohttp = "^3.8.4"
aiohttp = "^3.8.6"
python-json-logger = "^2.0.7"
aiohttp-middlewares = "^2.2.0"

[tool.poetry.dev-dependencies]
asynctest = "^0.13.0"
pytest = "^7.3.1"
coverage = {extras = ["toml"], version = "^7.2.5"}
pytest-asyncio = "^0.21.0"
pytest = "^7.4.3"
coverage = {extras = ["toml"], version = "^7.3.2"}
pytest-asyncio = "^0.21.1"
pytest-dotenv = "^0.5.2"
pytest-docker = "^1.0.1"
pytest-cov = "^4.0.0"
black = "^23.3.0"
flake8 = "^6.0.0"
pytest-docker = "^2.0.1"
pytest-cov = "^4.1.0"
black = "^23.11.0"
flake8 = "^6.1.0"
flake8-bandit = "^4.1.1"
flake8-black = "^0.3.6"
flake8-bugbear = "^23.3.23"
flake8-bugbear = "^23.9.16"
flake8-docstrings = "^1.7.0"
flake8-import-order = "^0.18.2"
pep8-naming = "^0.13.3"
safety = "^2.3.5"
mypy = "^1.2.0"
mypy = "^1.6.1"
flake8-annotations = "^3.0.1"
codecov = "^2.1.13"
requests-mock = "^1.10.0"
pytest-mock = "^3.10.0"
pytest-aiohttp = "^1.0.4"
requests-mock = "^1.11.0"
pytest-mock = "^3.12.0"
pytest-aiohttp = "^1.0.5"

[tool.coverage.paths]
source = ["src", "*/site-packages"]
Expand Down
2 changes: 1 addition & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def is_responsive(url: Any) -> Any:
"""Return true if response from service is 200."""
url = f"{url}/ready"
try:
response = requests.get(url)
response = requests.get(url, timeout=30)
if response.status_code == 200:
time.sleep(2) # sleep extra 2 sec
return True
Expand Down
4 changes: 2 additions & 2 deletions tests/contract/test_api_status.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
def test_ping(docker_service: str) -> None:
"""Should return OK."""
url = f"{docker_service}/ping"
response = requests.get(url)
response = requests.get(url, timeout=30)

assert response.status_code == 200
assert response.text == "OK"
Expand All @@ -19,7 +19,7 @@ def test_ping(docker_service: str) -> None:
def test_ready(docker_service: str) -> None:
"""Should return OK."""
url = f"{docker_service}/ready"
response = requests.get(url)
response = requests.get(url, timeout=30)

assert response.status_code == 200
assert response.text == "OK"
8 changes: 4 additions & 4 deletions tests/contract/test_get_all_catalogs.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
def test_all_catalogs(docker_service: str) -> None:
"""Should return the all_catalogs response."""
url = f"{docker_service}/organizationcatalogs"
response = requests.get(url)
response = requests.get(url, timeout=30)

assert response.status_code == 200
assert response.json() == json.loads(responses.all_catalogs)
Expand All @@ -23,7 +23,7 @@ def test_all_catalogs(docker_service: str) -> None:
def test_all_catalogs_has_fifteen_min_cache_headers(docker_service: str) -> None:
"""Should include no-cache headers."""
url = f"{docker_service}/organizationcatalogs"
response = requests.get(url)
response = requests.get(url, timeout=30)

assert response.status_code == 200
assert (
Expand All @@ -48,7 +48,7 @@ def test_all_include_empty(docker_service: str) -> None:
def test_all_nap_catalogs(docker_service: str) -> None:
"""Should return the all_nap response."""
url = f"{docker_service}/organizationcatalogs?filter=transportportal"
response = requests.get(url)
response = requests.get(url, timeout=30)

assert response.status_code == 200
assert response.json() == json.loads(responses.all_nap)
Expand All @@ -59,6 +59,6 @@ def test_all_nap_catalogs(docker_service: str) -> None:
def test_invalid_filter(docker_service: str) -> None:
"""Should return 400."""
url = f"{docker_service}/organizationcatalogs?filter=invalid"
response = requests.get(url)
response = requests.get(url, timeout=30)

assert response.status_code == 400
10 changes: 5 additions & 5 deletions tests/contract/test_get_specific_catalog.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
def test_liland(docker_service: str) -> None:
"""Should return the liland response."""
url = f"{docker_service}/organizationcatalogs/910258028"
response = requests.get(url)
response = requests.get(url, timeout=30)

assert response.status_code == 200
assert response.json() == json.loads(responses.liland)
Expand All @@ -23,7 +23,7 @@ def test_liland(docker_service: str) -> None:
def test_response_has_fifteen_minute_cache_headers(docker_service: str) -> None:
"""Should include no-cache headers."""
url = f"{docker_service}/organizationcatalogs/910258028"
response = requests.get(url)
response = requests.get(url, timeout=30)

assert response.status_code == 200
assert (
Expand All @@ -37,7 +37,7 @@ def test_response_has_fifteen_minute_cache_headers(docker_service: str) -> None:
def test_not_found(docker_service: str) -> None:
"""Should return 404."""
url = f"{docker_service}/organizationcatalogs/123"
response = requests.get(url)
response = requests.get(url, timeout=30)

assert response.status_code == 404

Expand All @@ -47,7 +47,7 @@ def test_not_found(docker_service: str) -> None:
def test_nap_ramsund(docker_service: str) -> None:
"""Should return the ramsund_nap response."""
url = f"{docker_service}/organizationcatalogs/910244132?filter=transportportal"
response = requests.get(url)
response = requests.get(url, timeout=30)

assert response.status_code == 200
assert response.json() == json.loads(responses.ramsund_nap)
Expand All @@ -58,6 +58,6 @@ def test_nap_ramsund(docker_service: str) -> None:
def test_invalid_filter(docker_service: str) -> None:
"""Should return 400."""
url = f"{docker_service}/organizationcatalogs/910244132?filter=invalid"
response = requests.get(url)
response = requests.get(url, timeout=30)

assert response.status_code == 400

0 comments on commit bc186ea

Please sign in to comment.