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.

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

Replace master with main branch #1740

Merged
merged 1 commit into from
Nov 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:
push:
branches:
- master
- main
tags:
schedule:
# Run everyday at 03:53 UTC
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/qa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:
push:
branches:
- master
- main
tags:

concurrency:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
# branches to consider in the event; optional, defaults to all
branches:
- master
- main
- "releases/**"
- "stable/**"

Expand All @@ -16,7 +16,7 @@ jobs:
if: github.repository == 'jazzband/pip-tools'
runs-on: ubuntu-latest
steps:
# Drafts your next release notes as Pull Requests are merged into "master"
# Drafts your next release notes as Pull Requests are merged into "main"
- uses: release-drafter/release-drafter@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Release
on:
push:
branches:
- master
- main
release:
types:
- published
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ To help keeping track of the releases and their changes, here's the current rele
- Push the branch to your fork and create a pull request.
- Merge the pull request after the changes being approved.
- Make sure that the tests/CI still pass.
- Once ready, go to [releases](https://github.com/jazzband/pip-tools/releases) page and publish the latest draft release. This will push a tag on the HEAD of master, trigger the CI pipeline and
- Once ready, go to [releases](https://github.com/jazzband/pip-tools/releases) page and publish the latest draft release. This will push a tag on the HEAD of the main branch, trigger the CI pipeline and
deploy a pip-tools release in the **Jazzband private package index** upon success.
- The pip-tools "lead" project members will receive an email notification to review the release and
deploy it to the public PyPI if all is correct.
Expand All @@ -42,4 +42,4 @@ Please be mindful of other before and when performing a release, and use this ac

Do not hesitate to ask questions if you have any before performing a release.

[changelog]: https://github.com/jazzband/pip-tools/blob/master/CHANGELOG.md
[changelog]: https://github.com/jazzband/pip-tools/blob/main/CHANGELOG.md
16 changes: 8 additions & 8 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@ pip-tools = pip-compile + pip-sync
A set of command line tools to help you keep your ``pip``-based packages fresh,
even when you've pinned them. You do pin them, right? (In building your Python application and its dependencies for production, you want to make sure that your builds are predictable and deterministic.)

.. image:: https://github.com/jazzband/pip-tools/raw/master/img/pip-tools-overview.svg
.. image:: https://github.com/jazzband/pip-tools/raw/main/img/pip-tools-overview.svg
:alt: pip-tools overview for phase II

.. |buildstatus-gha| image:: https://github.com/jazzband/pip-tools/workflows/CI/badge.svg
:alt: GitHub Actions build status
:target: https://github.com/jazzband/pip-tools/actions?query=workflow%3ACI
.. |codecov| image:: https://codecov.io/gh/jazzband/pip-tools/branch/master/graph/badge.svg
.. |codecov| image:: https://codecov.io/gh/jazzband/pip-tools/branch/main/graph/badge.svg
:alt: Coverage
:target: https://codecov.io/gh/jazzband/pip-tools
.. |jazzband| image:: https://jazzband.co/static/img/badge.svg
:alt: Jazzband
:target: https://jazzband.co/
.. |pre-commit| image:: https://results.pre-commit.ci/badge/github/jazzband/pip-tools/master.svg
.. |pre-commit| image:: https://results.pre-commit.ci/badge/github/jazzband/pip-tools/main.svg
:alt: pre-commit.ci status
:target: https://results.pre-commit.ci/latest/github/jazzband/pip-tools/master
:target: https://results.pre-commit.ci/latest/github/jazzband/pip-tools/main
.. |pypi| image:: https://img.shields.io/pypi/v/pip-tools.svg
:alt: PyPI version
:target: https://pypi.org/project/pip-tools/
Expand Down Expand Up @@ -95,7 +95,7 @@ optional dependency ``dev`` that includes ``pytest``:
name = "my-cool-django-app"
version = "42"
dependencies = ["django"]

[project.optional-dependencies]
dev = ["pytest"]

Expand All @@ -119,7 +119,7 @@ You can produce your pin files as easily as:
# via django

$ pip-compile --extra dev -o dev-requirements.txt pyproject.toml
#
#
# This file is autogenerated by pip-compile with python 3.10
# To update, run:
#
Expand Down Expand Up @@ -433,9 +433,9 @@ You might want to customize ``pip-compile`` args by configuring ``args`` and/or
files: ^requirements/production\.(in|txt)$
args: [--index-url=https://example.com, requirements/production.in]

If you have multiple requirement files make sure you create a hook for each file.
If you have multiple requirement files make sure you create a hook for each file.

.. code-block:: yaml
.. code-block:: yaml

repos:
- repo: https://github.com/jazzband/pip-tools
Expand Down
2 changes: 1 addition & 1 deletion tests/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ def test_key_from_ireq_normalization(from_line):
("file:///example.zip", True),
("https://example.com/example.zip", True),
("https://example.com/example.zip#egg=example", True),
("git+https://github.com/jazzband/pip-tools@master", True),
("git+https://github.com/jazzband/pip-tools@main", True),
),
)
def test_is_url_requirement(caplog, from_line, line, expected):
Expand Down