Merge branch 'master' into Fix-Template-CI-requirements

This commit is contained in:
Delphine LEMIRE 2023-02-19 20:18:58 +01:00 committed by GitHub
commit 9adc77c439
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 4 deletions

View File

@ -1362,5 +1362,10 @@
"name": "duffn", "name": "duffn",
"github_login": "duffn", "github_login": "duffn",
"twitter_username": "" "twitter_username": ""
},
{
"name": "Delphine LEMIRE",
"github_login": "DelphineLemire",
"twitter_username": ""
} }
] ]

View File

@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
<!-- GENERATOR_PLACEHOLDER --> <!-- GENERATOR_PLACEHOLDER -->
## 2023.02.17
### Changed
- Update version of github actions on the template project ([#4167](https://github.com/cookiecutter/cookiecutter-django/pull/4167))
## 2023.02.09 ## 2023.02.09
### Changed ### Changed

View File

@ -642,6 +642,13 @@ Listed in alphabetical order.
</td> </td>
<td>jangeador</td> <td>jangeador</td>
</tr> </tr>
<tr>
<td>Delphine LEMIRE</td>
<td>
<a href="https://github.com/DelphineLemire">DelphineLemire</a>
</td>
<td></td>
</tr>
<tr> <tr>
<td>Demetris Stavrou</td> <td>Demetris Stavrou</td>
<td> <td>

View File

@ -5,7 +5,7 @@ except ImportError:
from distutils.core import setup from distutils.core import setup
# We use calendar versioning # We use calendar versioning
version = "2023.02.09" version = "2023.02.17"
with open("README.rst") as readme_file: with open("README.rst") as readme_file:
long_description = readme_file.read() long_description = readme_file.read()

View File

@ -27,7 +27,7 @@ jobs:
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Set up Python - name: Set up Python
uses: actions/setup-python@v3 uses: actions/setup-python@v4
with: with:
python-version: "3.10" python-version: "3.10"
cache: pip cache: pip
@ -39,7 +39,7 @@ jobs:
# Consider using pre-commit.ci for open source project # Consider using pre-commit.ci for open source project
{%- endif %} {%- endif %}
- name: Run pre-commit - name: Run pre-commit
uses: pre-commit/action@v2.0.3 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 4m 30s to complete!
pytest: pytest:
@ -88,7 +88,7 @@ jobs:
{%- else %} {%- else %}
- name: Set up Python - name: Set up Python
uses: actions/setup-python@v3 uses: actions/setup-python@v4
with: with:
python-version: "3.10" python-version: "3.10"
cache: pip cache: pip