Skip to content

Commit

Permalink
Merge pull request #242 from filipsnastins/chore/bump-testcontainers-…
Browse files Browse the repository at this point in the history
…4-0-0

chore(deps): bump testcontainers to 4.0.0
  • Loading branch information
filipsnastins authored Mar 9, 2024
2 parents aceaac8 + 0372baa commit e5a1fba
Show file tree
Hide file tree
Showing 13 changed files with 152 additions and 250 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@ jobs:
build:
runs-on: ubuntu-latest
env:
POETRY_VIRTUALENVS_CREATE: false
TESTCONTAINER_DOCKER_NETWORK: tomodachi-testcontainers
DOCKER_BUILDKIT: 1
strategy:
max-parallel: 5
max-parallel: 4
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11']
python-version: ['3.9', '3.10', '3.11', '3.12']

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: 3.11
python-version: 3.12

- name: Set up Poetry cache for Python dependencies
uses: actions/cache@v4
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/test-docs-src.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ jobs:
build:
runs-on: ubuntu-latest
env:
POETRY_VIRTUALENVS_CREATE: false
TESTCONTAINER_DOCKER_NETWORK: tomodachi-testcontainers
DOCKER_BUILDKIT: 1
steps:
Expand All @@ -18,7 +17,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: 3.11
python-version: 3.12

- name: Set up Poetry cache for Python dependencies
uses: actions/cache@v4
Expand Down
6 changes: 3 additions & 3 deletions docs_src/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.11.4-slim-buster AS python-base
FROM python:3.12.2-slim-bullseye AS python-base
WORKDIR /app
ARG VIRTUAL_ENV=/opt/venv
RUN addgroup --gid 1001 app && adduser --uid 1000 --gid 1001 app
Expand All @@ -9,8 +9,8 @@ ENV VIRTUAL_ENV=$VIRTUAL_ENV \
PYTHONPATH=/app/src:$PYTHONPATH

FROM python-base AS dependencies-base
ARG PIP_VERSION=23.3.1
ARG POETRY_VERSION=1.7.1
ARG PIP_VERSION=24.0
ARG POETRY_VERSION=1.8.2
RUN python -m pip install --no-cache-dir -U \
"pip==$PIP_VERSION" \
"poetry==$POETRY_VERSION" && \
Expand Down
95 changes: 41 additions & 54 deletions docs_src/poetry.lock

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions docs_src/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description = ""
authors = ["Filips Nastins <nastinsfilips@gmail.com>"]

[tool.poetry.dependencies]
python = "^3.11"
python = "^3.12"
django = "^5.0.1"
fastapi = "^0.110.0"
flask = "^3.0.1"
Expand All @@ -22,17 +22,17 @@ uvicorn = "^0.27.1"
uvloop = "^0.19.0"

[tool.poetry.group.dev.dependencies]
pytest = "^8.1.0"
pytest = "^8.0.2"
pytest-asyncio = "0.21.1" # https://github.com/pytest-dev/pytest-asyncio/issues/706
requests = "^2.31.0"
types-requests = "^2.31.0"

[tool.black]
line-length = 120
target-version = ['py311']
target-version = ['py312']

[tool.mypy]
python_version = "3.11"
python_version = "3.12"
ignore_missing_imports = true

[tool.pytest.ini_options]
Expand Down
6 changes: 3 additions & 3 deletions examples/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.11.4-slim-buster AS python-base
FROM python:3.12.2-slim-bullseye AS python-base
WORKDIR /app
ARG VIRTUAL_ENV=/opt/venv
RUN addgroup --gid 1001 app && adduser --uid 1000 --gid 1001 app
Expand All @@ -9,8 +9,8 @@ ENV VIRTUAL_ENV=$VIRTUAL_ENV \
PYTHONPATH=/app/src:$PYTHONPATH

FROM python-base AS dependencies-base
ARG PIP_VERSION=23.3.1
ARG POETRY_VERSION=1.7.1
ARG PIP_VERSION=24.0
ARG POETRY_VERSION=1.8.2
RUN python -m pip install --no-cache-dir -U \
"pip==$PIP_VERSION" \
"poetry==$POETRY_VERSION" && \
Expand Down
79 changes: 33 additions & 46 deletions examples/poetry.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions examples/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description = ""
authors = ["Filips Nastins <nastinsfilips@gmail.com>"]

[tool.poetry.dependencies]
python = "^3.11"
python = "^3.12"
asyncssh = "^2.14.2"
pydantic = "^2.0.2"
structlog = "^24.1.0"
Expand Down Expand Up @@ -34,10 +34,10 @@ pytest-cov = "^4.1.0"

[tool.black]
line-length = 120
target-version = ['py311']
target-version = ['py312']

[tool.mypy]
python_version = "3.11"
python_version = "3.12"
ignore_missing_imports = true

[tool.coverage.run]
Expand Down
128 changes: 25 additions & 103 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit e5a1fba

Please sign in to comment.