Skip to content

Commit

Permalink
Merge pull request #59 from GSA-TTS/dependabot/pip/django_template/te…
Browse files Browse the repository at this point in the history
…mplates/django-5.0.8

Bump django from 5.0.7 to 5.0.8 in /django_template/templates
  • Loading branch information
rahearn authored Aug 20, 2024
2 parents 7c5cb60 + bde6ac2 commit 6077ab3
Show file tree
Hide file tree
Showing 6 changed files with 73 additions and 80 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
name: Code linting

on:
push:
pull_request:
types: [opened, reopened]
on: [pull_request]


jobs:
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/unittests.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
name: Unit tests

on:
push:
pull_request:
types: [opened, reopened]
on: [pull_request]

jobs:
unittests:
Expand Down
111 changes: 55 additions & 56 deletions Pipfile.lock

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

12 changes: 6 additions & 6 deletions django_template/templates/Pipfile.lock

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

Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ jobs:
steps:
- uses: actions/checkout@v3

# we already have docker-compose set up for local
# we already have docker compose set up for local
# testing, use that here
- name: Start containers
run: docker-compose up -d --build
run: docker compose up -d --build

- name: Run Tests
run: docker-compose run app python manage.py test
run: docker compose run app python manage.py test

- name: Stop containers
if: always()
run: docker-compose down
run: docker compose down
12 changes: 6 additions & 6 deletions tests/test_integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def project(tmp_path_factory):

# Try building the docker images here to make the later tests more
# reliable.
creator.exec_in_destination(["docker-compose", "build"])
creator.exec_in_destination(["docker", "compose", "build"])

yield creator

Expand Down Expand Up @@ -53,17 +53,17 @@ def _check_docker_running():
@docker_is_running
def test_docker_compose_build(project):
"""Can run docker_compose build."""
project.exec_in_destination(["docker-compose", "build"])
project.exec_in_destination(["docker", "compose", "build"])


@docker_is_running
def test_docker_tests(project):
"""Can run tests in docker."""
project.exec_in_destination(
["docker-compose", "run", "app", "python", "manage.py", "migrate"]
["docker", "compose", "run", "app", "python", "manage.py", "migrate"]
)
project.exec_in_destination(
["docker-compose", "run", "app", "python", "manage.py", "test"]
["docker", "compose", "run", "app", "python", "manage.py", "test"]
)


Expand All @@ -72,14 +72,14 @@ def _docker_up(project):
try:
project.exec_in_destination(
# run in daemon mode
["docker-compose", "up", "-d"]
["docker", "compose", "up", "-d"]
)
# that might take a while to get up and running, let's just wait
# a magic number of seconds. TODO: use a better waiting method
time.sleep(5)
yield
finally:
project.exec_in_destination(["docker-compose", "stop"])
project.exec_in_destination(["docker", "compose", "stop"])


@docker_is_running
Expand Down

0 comments on commit 6077ab3

Please sign in to comment.