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

Bump tox-docker from 4.1.0 to 5.0.0 #152

Merged
merged 3 commits into from
Jun 18, 2024
Merged

Bump tox-docker from 4.1.0 to 5.0.0 #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
63b17a8
Bump tox-docker from 4.1.0 to 5.0.0
dependabot[bot] Jun 18, 2024
cffe06c
Update tox configuration.
jonathangreen Jun 18, 2024
5bcb64c
Update lock
jonathangreen Jun 18, 2024
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
94 changes: 34 additions & 60 deletions poetry.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ setuptools = "^70.0.0"
dunamai = "^1.16"
pre-commit = "^3.0"
tox = "^4.5"
tox-docker = "^4.0"
tox-docker = "^5.0"
tox-gh-actions = "^3.0"

[tool.poetry.group.dev.dependencies]
Expand Down
15 changes: 8 additions & 7 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ docker =
docker: db-vlc
docker: minio-vlc
setenv =
docker: VLC_DEV_DB_HOST=localhost
docker: VLC_DEV_DB_PORT=9010
docker: VLC_DEV_AWS_S3_ENDPOINT_URL=http://localhost:9011
COVERAGE_FILE = .coverage.{envname}
allowlist_externals =
poetry
Expand All @@ -35,8 +32,10 @@ environment =
POSTGRES_USER=vlc
POSTGRES_PASSWORD=test
POSTGRES_DB=test_virtual_library_card_dev
ports =
9010:5432/tcp
expose =
VLC_DEV_DB_PORT=5432/tcp
host_var =
VLC_DEV_DB_HOST
healthcheck_cmd = pg_isready
healthcheck_interval = 5
healthcheck_retries = 10
Expand All @@ -47,8 +46,10 @@ environment =
MINIO_ACCESS_KEY=vlc-minio
MINIO_SECRET_KEY=123456789
MINIO_DEFAULT_BUCKETS=vlc-test:download
ports =
9011:9000/tcp
expose =
VLC_DEV_AWS_S3_ENDPOINT_URL_PORT=9000/tcp
host_var =
VLC_DEV_AWS_S3_ENDPOINT_URL_HOST

[gh-actions]
python =
Expand Down
16 changes: 13 additions & 3 deletions virtual_library_card/settings/dev.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,19 @@
DEFAULT_FILE_STORAGE = "virtual_library_card.storage.S3PublicStorage"
STATICFILES_STORAGE = "virtual_library_card.storage.S3StaticStorage"
AWS_STORAGE_BUCKET_NAME = "vlc-test"
AWS_S3_ENDPOINT_URL = os.environ.get(
"VLC_DEV_AWS_S3_ENDPOINT_URL", "http://localhost:9000"
)
if "VLC_DEV_AWS_S3_ENDPOINT_URL" in os.environ:
AWS_S3_ENDPOINT_URL = os.environ["VLC_DEV_AWS_S3_ENDPOINT_URL"]
elif (
"VLC_DEV_AWS_S3_ENDPOINT_URL_HOST" in os.environ
and "VLC_DEV_AWS_S3_ENDPOINT_URL_PORT" in os.environ
):
AWS_S3_ENDPOINT_URL = (
f"http://{os.environ['VLC_DEV_AWS_S3_ENDPOINT_URL_HOST']}"
f":{os.environ['VLC_DEV_AWS_S3_ENDPOINT_URL_PORT']}"
)
else:
AWS_S3_ENDPOINT_URL = "http://localhost:9000"

AWS_S3_CUSTOM_DOMAIN = os.environ.get("VLC_DEV_AWS_S3_CUSTOM_DOMAIN", False)
AWS_S3_URL_PROTOCOL = os.environ.get("VLC_DEV_AWS_S3_URL_PROTOCOL", "https:")

Expand Down