Skip to content

Commit 7ad5d3b

Browse files
authored
Update requirements version (#255)
1 parent 2cf6f81 commit 7ad5d3b

6 files changed

Lines changed: 32 additions & 30 deletions

File tree

.github/workflows/checks.yml

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ name: CI
77

88
on:
99
push:
10-
branches: [ dev ]
10+
branches: [dev]
1111
pull_request:
12-
branches: [ dev ]
12+
branches: [dev]
1313

1414
jobs:
1515
Test:
@@ -18,12 +18,13 @@ jobs:
1818
strategy:
1919
fail-fast: true
2020
matrix:
21-
py-version-img: [
22-
["3.9", "3.9-slim-bookworm"],
23-
["3.10", "3.10-slim-bookworm"],
24-
["3.11", "3.11-slim-bookworm"],
25-
["3.12", "3.12-slim-bookworm"],
26-
]
21+
py-version-img:
22+
[
23+
["3.9", "3.9-slim-bookworm"],
24+
["3.10", "3.10-slim-bookworm"],
25+
["3.11", "3.11-slim-bookworm"],
26+
["3.12", "3.12-slim-bookworm"],
27+
]
2728
mongodb-version: ["4.4", "5.0", "6.0", "7.0"]
2829
mongodb-port: [12345]
2930

@@ -72,7 +73,8 @@ jobs:
7273
--build-arg PY_IMAGE=${PY_IMAGE} \
7374
.
7475
cd ./examples/petstore
75-
docker-compose up --build -d
76+
docker compose build foca-petstore-root
77+
docker compose up -d
7678
cd ../..
7779
sleep 10
7880
pytest ./tests/integration_tests.py
@@ -83,12 +85,13 @@ jobs:
8385
strategy:
8486
fail-fast: true
8587
matrix:
86-
py-version-img-tag: [
87-
["3.9", "3.9-slim-bookworm", ""],
88-
["3.10", "3.10-slim-bookworm", ""],
89-
["3.11", "3.11-slim-bookworm", ""],
90-
["3.12", "3.12-slim-bookworm", "latest"],
91-
]
88+
py-version-img-tag:
89+
[
90+
["3.9", "3.9-slim-bookworm", ""],
91+
["3.10", "3.10-slim-bookworm", ""],
92+
["3.11", "3.11-slim-bookworm", ""],
93+
["3.12", "3.12-slim-bookworm", "latest"],
94+
]
9295

9396
steps:
9497
- name: Checkout Repository

examples/petstore-access-control/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services:
77
context: ../../
88
dockerfile: docker/Dockerfile
99
args:
10-
PY_IMAGE: ${PETSTORE_PY_IMAGE:-3.10-slim-buster}
10+
PY_IMAGE: ${PETSTORE_PY_IMAGE:-3.10-slim-bookworm}
1111
image: foca-petstore-access-control-root:latest
1212
restart: "no"
1313

examples/petstore/docker-compose.yaml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,28 @@
1-
version: '3.6'
1+
version: "3.6"
22
services:
3-
43
# build app image based on current FOCA root image
54
foca-petstore-root:
65
build:
76
context: ../../
87
dockerfile: docker/Dockerfile
98
args:
10-
PY_IMAGE: ${PETSTORE_PY_IMAGE:-3.10-slim-buster}
9+
PY_IMAGE: ${PETSTORE_PY_IMAGE:-3.10-slim-bookworm}
1110
image: foca-petstore-root:latest
1211
restart: "no"
1312

1413
app:
15-
image: elixircloud/foca-petstore:latest
14+
image: elixircloud/foca-petstore-root:latest
1615
depends_on:
1716
- foca-petstore-root
1817
build:
1918
context: .
2019
dockerfile: Dockerfile
2120
restart: unless-stopped
22-
links:
23-
- mongodb
21+
# links:
22+
# - mongodb
2423
command: bash -c "python app.py"
2524
ports:
26-
- "80:8080"
25+
- "8080:8080"
2726

2827
mongodb:
2928
image: mongo:7.0

requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
addict~=2.2
22
celery~=5.2
33
connexion~=2.11
4-
cryptography~=42.0
4+
cryptography~=44.0.1
55
Flask~=2.2
66
flask-authz~=2.5.1
7-
Flask-Cors~=4.0
7+
Flask-Cors~=6.0.0
88
Flask-PyMongo~=2.3
99
pydantic~=2.7
1010
PyJWT~=2.4
@@ -14,4 +14,4 @@ requests~=2.31
1414
swagger-ui-bundle~=0.0
1515
toml~=0.10
1616
typing~=3.7
17-
Werkzeug~=2.2
17+
Werkzeug~=3.1.5

setup.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version = attr: foca.__version__
33

44
[flake8]
55
exclude = .git,.eggs,build,venv,env
6-
max-line-length = 79
6+
max-line-length = 120
77

88
[semantic_release]
99
; documentation: https://python-semantic-release.readthedocs.io/en/latest/configuration.html
@@ -17,4 +17,4 @@ upload_to_release = true
1717
version_variable = foca/__init__.py:__version__
1818

1919
[mypy]
20-
ignore_missing_imports = True
20+
ignore_missing_imports = True

tests/integration_tests.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Pets,
99
)
1010

11-
PETSTORE_URL = "http://localhost:80"
11+
PETSTORE_URL = "http://localhost:8080"
1212
NAME_PET = "karl"
1313
TAG_PET = "frog"
1414
EXTRA_PARAM_ARG = "extra"
@@ -48,7 +48,7 @@ def test_add_pet_extra_parameter_200():
4848
assert isinstance(response_data, Pet)
4949
assert response_data.name == NAME_PET
5050
assert response_data.tag == TAG_PET
51-
assert getattr(response_data, 'extra_parameter', None) is None
51+
assert getattr(response_data, "extra_parameter", None) is None
5252

5353

5454
def test_add_pet_required_arguments_missing_400():

0 commit comments

Comments
 (0)