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

[pull] master from cookiecutter:master #713

Merged
merged 4 commits into from
Feb 16, 2024
Merged

[pull] master from cookiecutter:master #713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd959ee
Added link to the ruff repository (#4866)
mpsantos Feb 16, 2024
6237573
Speed up CI pytest by 30%: Change ci.yml to only build images relevan…
mtmpaulwulff Feb 16, 2024
80147bd
Update Contributors
browniebroke Feb 16, 2024
f77233d
Update gitpython to 3.1.42 (#4864)
pyup-bot Feb 16, 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
5 changes: 5 additions & 0 deletions .github/contributors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1518,5 +1518,10 @@
"name": "henningbra",
"github_login": "henningbra",
"twitter_username": ""
},
{
"name": "Paul Wulff",
"github_login": "mtmpaulwulff",
"twitter_username": ""
}
]
7 changes: 7 additions & 0 deletions CONTRIBUTORS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1650,6 +1650,13 @@ Listed in alphabetical order.
</td>
<td></td>
</tr>
<tr>
<td>Paul Wulff</td>
<td>
<a href="https://github.com/mtmpaulwulff">mtmpaulwulff</a>
</td>
<td></td>
</tr>
<tr>
<td>Pawan Chaurasia</td>
<td>
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ pyyaml==6.0.1
# Scripting
# ------------------------------------------------------------------------------
PyGithub==2.2.0
gitpython==3.1.41
gitpython==3.1.42
jinja2==3.1.3
requests==2.31.0
4 changes: 2 additions & 2 deletions {{cookiecutter.project_slug}}/.github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Run pre-commit
uses: pre-commit/action@v3.0.0

# With no caching at all the entire ci process takes 4m 30s to complete!
# With no caching at all the entire ci process takes 3m to complete!
pytest:
runs-on: ubuntu-latest
{%- if cookiecutter.use_docker == 'n' %}
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
{%- if cookiecutter.use_docker == 'y' %}

- name: Build the Stack
run: docker compose -f local.yml build
run: docker compose -f local.yml build django

- name: Run DB Migrations
run: docker compose -f local.yml run --rm django python manage.py migrate
Expand Down
2 changes: 1 addition & 1 deletion {{cookiecutter.project_slug}}/requirements/local.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ sphinx-autobuild==2024.2.4 # https://github.com/GaretJax/sphinx-autobuild

# Code quality
# ------------------------------------------------------------------------------
ruff==0.2.1
ruff==0.2.1 # https://github.com/astral-sh/ruff
coverage==7.4.1 # https://github.com/nedbat/coveragepy
djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint
pre-commit==3.6.1 # https://github.com/pre-commit/pre-commit
Expand Down