Skip to content

Commit

Permalink
Use nox for release tasks
Browse files Browse the repository at this point in the history
Merge pull request #6937 from pradyunsg/use-nox
  • Loading branch information
pradyunsg authored Sep 9, 2019
2 parents e023973 + 7256a10 commit dc2dff3
Show file tree
Hide file tree
Showing 8 changed files with 67 additions and 57 deletions.
6 changes: 3 additions & 3 deletions .azure-pipelines/jobs/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ jobs:
inputs:
versionSpec: '3'

- bash: pip install setuptools tox wheel invoke towncrier requests
- bash: pip install tox nox setuptools wheel
displayName: Install dependencies

- bash: invoke generate.authors
- bash: nox -s generate_authors
displayName: Generate AUTHORS.txt

- bash: invoke generate.news --yes
- bash: nox -s generate_news -- --yes
displayName: Generate NEWS.rst

- bash: tox -e packaging
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ docs/build/
.mypy_cache/

# Unit test / coverage reports
.tox/
.[nt]ox/
htmlcov/
.coverage
.coverage.*
Expand Down
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ exclude .appveyor.yml
exclude .travis.yml
exclude .readthedocs.yml
exclude tox.ini
exclude noxfile.py

recursive-include src/pip/_vendor *.pem
recursive-include docs Makefile *.rst *.py *.bat
Expand Down
7 changes: 3 additions & 4 deletions docs/html/development/release-process.rst
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,13 @@ Creating a new release
----------------------

#. Checkout the current pip ``master`` branch.
#. Ensure you have the latest ``wheel``, ``setuptools``, ``twine``, ``invoke``
and ``towncrier`` packages installed.
#. Generate a new ``AUTHORS.txt`` (``invoke generate.authors``) and commit the
#. Ensure you have the latest ``wheel``, ``setuptools``, ``twine`` and ``nox`` packages installed.
#. Generate a new ``AUTHORS.txt`` (``nox -s generate_authors``) and commit the
results.
#. Bump the version in ``pip/__init__.py`` to the release version and commit
the results. Usually this involves dropping just the ``.devN`` suffix on the
version.
#. Generate a new ``NEWS.rst`` (``invoke generate.news``) and commit the
#. Generate a new ``NEWS.rst`` (``nox -s generate_news``) and commit the
results.
#. Create a tag at the current commit, of the form ``YY.N``
(``git tag YY.N``).
Expand Down
55 changes: 55 additions & 0 deletions noxfile.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
"""Release time helpers, executed using nox.
"""

import io
import subprocess

import nox


def get_author_list():
"""Get the list of authors from Git commits.
"""
# subprocess because session.run doesn't give us stdout
result = subprocess.run(
["git", "log", "--use-mailmap", "--format=%aN <%aE>"],
capture_output=True,
encoding="utf-8",
)

# Create a unique list.
authors = []
seen_authors = set()
for author in result.stdout.splitlines():
author = author.strip()
if author.lower() not in seen_authors:
seen_authors.add(author.lower())
authors.append(author)

# Sort our list of Authors by their case insensitive name
return sorted(authors, key=lambda x: x.lower())


# -----------------------------------------------------------------------------
# Commands used during the release process
# -----------------------------------------------------------------------------
@nox.session
def generate_authors(session):
# Get our list of authors
session.log("Collecting author names")
authors = get_author_list()

# Write our authors to the AUTHORS file
session.log("Writing AUTHORS")
with io.open("AUTHORS.txt", "w", encoding="utf-8") as fp:
fp.write(u"\n".join(authors))
fp.write(u"\n")


@nox.session
def generate_news(session):
session.log("Generating NEWS")
session.install("towncrier")

# You can pass 2 possible arguments: --draft, --yes
session.run("towncrier", *session.posargs)
2 changes: 2 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[isort]
skip =
./build,
.nox,
.tox,
.scratch,
_vendor,
Expand All @@ -17,6 +18,7 @@ include_trailing_comma = true
[flake8]
exclude =
./build,
.nox,
.tox,
.scratch,
_vendor,
Expand Down
4 changes: 2 additions & 2 deletions tasks/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import invoke

from tools.automation import generate, vendoring
from tools.automation import vendoring

ns = invoke.Collection(generate, vendoring)
ns = invoke.Collection(vendoring)
47 changes: 0 additions & 47 deletions tools/automation/generate.py

This file was deleted.

0 comments on commit dc2dff3

Please sign in to comment.