mirror of
https://github.com/cookiecutter/cookiecutter-django.git
synced 2025-08-06 21:20:16 +03:00
parent
8504540ada
commit
6038ec0e4d
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
|
@ -2,7 +2,7 @@ name: CI
|
|||
|
||||
on:
|
||||
push:
|
||||
branches: ["master", "main"]
|
||||
branches: ["main"]
|
||||
pull_request:
|
||||
|
||||
concurrency:
|
||||
|
|
2
.github/workflows/update-contributors.yml
vendored
2
.github/workflows/update-contributors.yml
vendored
|
@ -3,7 +3,7 @@ name: Update Contributors
|
|||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- main
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
|
|
@ -14,7 +14,7 @@ Always happy to get issues identified and pull requests!
|
|||
2. Clone your fork
|
||||
3. Create a branch for your changes
|
||||
|
||||
This last step is very important, don't start developing from master, it'll cause pain if you need to send another change later.
|
||||
This last step is very important, don't start developing from main, it'll cause pain if you need to send another change later.
|
||||
|
||||
## Testing
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
# Cookiecutter Django
|
||||
|
||||
[](https://github.com/cookiecutter/cookiecutter-django/actions/workflows/ci.yml?query=branch%3Amaster)
|
||||
[](https://github.com/cookiecutter/cookiecutter-django/actions/workflows/ci.yml?query=branch%3Amain)
|
||||
[](https://cookiecutter-django.readthedocs.io/en/latest/?badge=latest)
|
||||
[](https://results.pre-commit.ci/latest/github/cookiecutter/cookiecutter-django/master)
|
||||
[](https://results.pre-commit.ci/latest/github/cookiecutter/cookiecutter-django/main)
|
||||
[](https://github.com/ambv/black)
|
||||
|
||||
[](https://pyup.io/repos/github/cookiecutter/cookiecutter-django/)
|
||||
|
@ -184,7 +184,7 @@ Create a git repo and push it there:
|
|||
git add .
|
||||
git commit -m "first awesome commit"
|
||||
git remote add origin git@github.com:pydanny/redditclone.git
|
||||
git push -u origin master
|
||||
git push -u origin main
|
||||
|
||||
Now take a look at your repo. Don't forget to carefully look at the generated README. Awesome, right?
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@ It is there to add a migration so you don't have to manually change the ``sites.
|
|||
|
||||
See `0003_set_site_domain_and_name.py`_.
|
||||
|
||||
.. _`0003_set_site_domain_and_name.py`: https://github.com/cookiecutter/cookiecutter-django/blob/master/%7B%7Bcookiecutter.project_slug%7D%7D/%7B%7Bcookiecutter.project_slug%7D%7D/contrib/sites/migrations/0003_set_site_domain_and_name.py
|
||||
.. _`0003_set_site_domain_and_name.py`: https://github.com/cookiecutter/cookiecutter-django/blob/main/%7B%7Bcookiecutter.project_slug%7D%7D/%7B%7Bcookiecutter.project_slug%7D%7D/contrib/sites/migrations/0003_set_site_domain_and_name.py
|
||||
|
||||
|
||||
Why aren't you using just one configuration file (12-Factor App)
|
||||
|
|
|
@ -96,9 +96,9 @@ With that in mind, when merging changes, it's a good idea to set the labels and
|
|||
|
||||
`update-contributors.yml`
|
||||
|
||||
Runs on each push to master branch. List the 5 most recently merged pull requests and extract their author. If any of the authors is a new one, updates the `.github/contributors.json`, regenerate the `CONTRIBUTORS.md` from it, and push back the changes to master.
|
||||
Runs on each push to main branch. List the 5 most recently merged pull requests and extract their author. If any of the authors is a new one, updates the `.github/contributors.json`, regenerate the `CONTRIBUTORS.md` from it, and push back the changes to master.
|
||||
|
||||
#### Limitations
|
||||
|
||||
- If you merge a pull request from a new contributor, and merge another one right after, the push to master will fail as the remote will be out of date.
|
||||
- If you merge a pull request from a new contributor, and merge another one right after, the push to main will fail as the remote will be out of date.
|
||||
- If you merge more than 5 pull requests in a row like this, the new contributor might fail to be added.
|
||||
|
|
|
@ -6,7 +6,7 @@ from pathlib import Path
|
|||
|
||||
try:
|
||||
# Inspired by
|
||||
# https://github.com/django/django/blob/master/django/utils/crypto.py
|
||||
# https://github.com/django/django/blob/main/django/utils/crypto.py
|
||||
random = random.SystemRandom()
|
||||
using_sysrandom = True
|
||||
except NotImplementedError:
|
||||
|
|
|
@ -7,11 +7,11 @@ env:
|
|||
|
||||
on:
|
||||
pull_request:
|
||||
branches: ['master', 'main']
|
||||
branches: ['main']
|
||||
paths-ignore: ['docs/**']
|
||||
|
||||
push:
|
||||
branches: ['master', 'main']
|
||||
branches: ['main']
|
||||
paths-ignore: ['docs/**']
|
||||
|
||||
concurrency:
|
||||
|
|
Loading…
Reference in New Issue
Block a user