Skip to content

Commit 094f969

Browse files
committed
Rename default branch from master to main
1 parent aae69f3 commit 094f969

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: CI
22
on:
33
push:
44
branches:
5-
- master
5+
- main
66
pull_request:
77
jobs:
88
test:
@@ -84,7 +84,7 @@ jobs:
8484
- run: mv localhost:8000/django-pattern-library/demo site
8585
# Demo render_patterns.
8686
- run: poetry run django-admin render_patterns --settings=tests.settings.production --pythonpath=. --wrap-fragments --output=site/dpl-rendered-patterns
87-
# Package build, incl. publishing an experimental pre-release via GitHub Pages for builds on `master`.
87+
# Package build, incl. publishing an experimental pre-release via GitHub Pages for builds on `main`.
8888
- run: cat pyproject.toml| awk '{sub(/^version = .+/,"version = \"0.0.0.dev\"")}1' > pyproject.toml.tmp && mv pyproject.toml.tmp pyproject.toml
8989
- run: poetry build
9090
- run: mv dist site
@@ -96,7 +96,7 @@ jobs:
9696
deploy_site:
9797
runs-on: ubuntu-latest
9898
needs: build_site
99-
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
99+
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
100100
steps:
101101
- uses: actions/checkout@v2
102102
- uses: actions/download-artifact@v2

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Create a pull request with your changes so that it can be code reviewed by a mai
8787

8888
## Releasing a new version
8989

90-
On the `master` branch:
90+
On the `main` branch:
9191

9292
1. Bump the release number in `pyproject.toml`
9393
2. Update the CHANGELOG

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
> UI pattern libraries for Django templates. Try our [online demo](https://torchbox.github.io/django-pattern-library/demo/pattern-library/).
66
7-
![Screenshot of the pattern library UI, with navigation, pattern rendering, and configuration](https://raw.githubusercontent.com/torchbox/django-pattern-library/master/.github/pattern-library-screenshot.webp)
7+
![Screenshot of the pattern library UI, with navigation, pattern rendering, and configuration](https://raw.githubusercontent.com/torchbox/django-pattern-library/main/.github/pattern-library-screenshot.webp)
88

99
## Features
1010

@@ -50,16 +50,16 @@ Documentation is available at [torchbox.github.io/django-pattern-library](https:
5050

5151
## Contributing
5252

53-
See anything you like in here? Anything missing? We welcome all support, whether on bug reports, feature requests, code, design, reviews, tests, documentation, and more. Please have a look at our [contribution guidelines](https://github.com/torchbox/django-pattern-library/blob/master/CONTRIBUTING.md).
53+
See anything you like in here? Anything missing? We welcome all support, whether on bug reports, feature requests, code, design, reviews, tests, documentation, and more. Please have a look at our [contribution guidelines](https://github.com/torchbox/django-pattern-library/blob/main/CONTRIBUTING.md).
5454

5555
If you want to set up the project on your own computer, the contribution guidelines also contain all of the setup commands.
5656

5757
### Nightly builds
5858

59-
To try out the latest features before a release, we also create builds from every commit to `master`. Note we make no guarantee as to the quality of those pre-releases, and the pre-releases are overwritten on every build so shouldn’t be relied on for reproducible builds. [Download the latest `django_pattern_library-0.0.0.dev0-py3-none-any.whl`](http://torchbox.github.io/django-pattern-library/dist/django_pattern_library-0.0.0.dev0-py3-none-any.whl).
59+
To try out the latest features before a release, we also create builds from every commit to `main`. Note we make no guarantee as to the quality of those pre-releases, and the pre-releases are overwritten on every build so shouldn’t be relied on for reproducible builds. [Download the latest `django_pattern_library-0.0.0.dev0-py3-none-any.whl`](http://torchbox.github.io/django-pattern-library/dist/django_pattern_library-0.0.0.dev0-py3-none-any.whl).
6060

6161
## Credits
6262

63-
View the full list of [contributors](https://github.com/torchbox/django-pattern-library/graphs/contributors). [BSD](https://github.com/torchbox/django-pattern-library/blob/master/LICENSE) licensed.
63+
View the full list of [contributors](https://github.com/torchbox/django-pattern-library/graphs/contributors). [BSD](https://github.com/torchbox/django-pattern-library/blob/main/LICENSE) licensed.
6464

6565
Project logo from [FxEmoji](https://github.com/mozilla/fxemoji). Documentation website built with [MkDocs](https://www.mkdocs.org/), and hosted in [GitHub Pages](https://pages.github.com/).

docs/reference/concepts.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ A fragment is a pattern whose markup does not include all of the resources (typi
1212

1313
To enable them to be correctly displayed in the pattern library, `django-pattern-library` will inject the rendered markup of fragments into the **pattern base template** specified by `PATTERN_LIBRARY['PATTERN_BASE_TEMPLATE_NAME']`.
1414

15-
This template should include references to any required static files. The rendered markup of fragments will be available in the `pattern_library_rendered_pattern` context variable (see the tests for [an example](https://github.com/torchbox/django-pattern-library/blob/master/tests/templates/patterns/base.html)).
15+
This template should include references to any required static files. The rendered markup of fragments will be available in the `pattern_library_rendered_pattern` context variable (see the tests for [an example](https://github.com/torchbox/django-pattern-library/blob/main/tests/templates/patterns/base.html)).
1616

1717
## Pages
1818

1919
In contrast to fragments, pages are patterns that include everything they need to be displayed correctly in their markup. Pages are defined by `PATTERN_LIBRARY['BASE_TEMPLATE_NAMES']`.
2020

2121
Any template in that list — or that extends a template in that list — is considered a page and will be displayed as-is when rendered in the pattern library.
2222

23-
It is common practice for page templates to extend the pattern base template to avoid duplicate references to stylesheets and Javascript bundles. Again, [an example](https://github.com/torchbox/django-pattern-library/blob/master/tests/templates/patterns/base_page.html) of this can be seen in the tests.
23+
It is common practice for page templates to extend the pattern base template to avoid duplicate references to stylesheets and Javascript bundles. Again, [an example](https://github.com/torchbox/django-pattern-library/blob/main/tests/templates/patterns/base_page.html) of this can be seen in the tests.
2424

mkdocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
site_name: django-pattern-library
22
repo_url: https://github.com/torchbox/django-pattern-library
33
site_url:
4-
edit_uri: edit/master/docs/
4+
edit_uri: edit/main/docs/
55

66
repo_name: django-pattern-library
77
dev_addr: localhost:8001

0 commit comments

Comments
 (0)