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

Jump to bottom

rename master to main #100

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

rename master to main #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
661eca4
rename master to main
jvanasco Nov 14, 2022
37292a4
trying to workaround py37 issue
jvanasco Nov 17, 2022
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
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ matrix:

install:
- travis_retry pip install tox
- travis_retry pip install --upgrade importlib-metadata

script:
- travis_retry tox
Expand Down
2 changes: 2 additions & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ unreleased

- Optionally include bcc information on send.
See https://github.com/Pylons/pyramid_mailer/pull/87

- Rename "master" to "main"

.. _v0.15.1:

Expand Down
2 changes: 1 addition & 1 deletion README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
``pyramid_mailer``
==================

.. image:: https://travis-ci.org/Pylons/pyramid_mailer.png?branch=master
.. image:: https://travis-ci.org/Pylons/pyramid_mailer.png?branch=main
:target: https://travis-ci.org/Pylons/pyramid_mailer

.. image:: https://readthedocs.org/projects/pyramid_mailer/badge/?version=latest
Expand Down
6 changes: 3 additions & 3 deletions contributing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ You can contribute to this project in several ways.
* Fork this project, create a new branch, commit your suggested change, and push to your fork on GitHub.
When ready, submit a pull request for consideration.
[GitHub Flow](https://guides.github.com/introduction/flow/index.html) describes the workflow process and why it's a good practice.
When submitting a pull request, sign [CONTRIBUTORS.txt](https://github.com/Pylons/pyramid_mailer/blob/master/CONTRIBUTORS.txt) if you have not yet done so.
When submitting a pull request, sign [CONTRIBUTORS.txt](https://github.com/Pylons/pyramid_mailer/blob/main/CONTRIBUTORS.txt) if you have not yet done so.
* Join the [IRC channel #pyramid on irc.freenode.net](https://webchat.freenode.net/?channels=pyramid).

## Git Branches

Git branches and their purpose and status at the time of this writing are listed below.

* [master](https://github.com/Pylons/pyramid_mailer/) - The branch which should always be *deployable*. The default branch on GitHub.
* For development, create a new branch. If changes on your new branch are accepted, they will be merged into the master branch and deployed.
* [main](https://github.com/Pylons/pyramid_mailer/) - The branch which should always be *deployable*. The default branch on GitHub.
* For development, create a new branch. If changes on your new branch are accepted, they will be merged into the main branch and deployed.

## Running tests and building documentation

Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
# The suffix of source filenames.
source_suffix = '.rst'

# The master toctree document.
# The main toctree document.
master_doc = 'index'

# General substitutions.
Expand Down