summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernat Gabor <bgabor8@bloomberg.net>2020-02-10 09:09:31 +0000
committerBernat Gabor <bgabor8@bloomberg.net>2020-02-10 09:23:18 +0000
commit0c020c69c6729350ba27fea094f36ad4e847731e (patch)
tree7d86afb3579ba963b610242258d756253aca8bf3
parent28fdddc484ab274ce4f4d711fbca18b98b182f7c (diff)
downloadvirtualenv-20.0.0.tar.gz
release 20.0.020.0.0
Signed-off-by: Bernat Gabor <bgabor8@bloomberg.net>
-rw-r--r--azure-pipelines.yml2
-rw-r--r--docs/changelog.rst (renamed from docs/changes.rst)0
-rw-r--r--docs/development.rst4
-rw-r--r--docs/index.rst2
-rw-r--r--pyproject.toml2
-rw-r--r--tox.ini3
6 files changed, 6 insertions, 7 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index fe401b2..30f79b5 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -12,7 +12,7 @@ trigger:
branches:
include:
- master
- - rewrite
+ - legacy
- refs/tags/*
pr:
diff --git a/docs/changes.rst b/docs/changelog.rst
index 6dea3dd..6dea3dd 100644
--- a/docs/changes.rst
+++ b/docs/changelog.rst
diff --git a/docs/development.rst b/docs/development.rst
index 70a2673..4b4b9e5 100644
--- a/docs/development.rst
+++ b/docs/development.rst
@@ -147,7 +147,7 @@ pull request. If needed, project maintainers can manually trigger a restart of a
NEWS entries
~~~~~~~~~~~~
-The ``changes.rst`` file is managed using :pypi:`towncrier` and all non trivial changes must be accompanied by a news
+The ``changelog.rst`` file is managed using :pypi:`towncrier` and all non trivial changes must be accompanied by a news
entry. To add an entry to the news file, first you need to have created an issue describing the change you want to
make. A Pull Request itself *may* function as such, but it is preferred to have a dedicated issue (for example, in case
the PR ends up rejected due to code quality reasons).
@@ -174,7 +174,7 @@ The contents of this file are reStructuredText formatted text that will be used
You do not need to reference the issue or PR numbers here as towncrier will automatically add a reference to all of
the affected issues when rendering the news file.
-In order to maintain a consistent style in the ``changes.rst`` file, it is preferred to keep the news entry to the
+In order to maintain a consistent style in the ``changelog.rst`` file, it is preferred to keep the news entry to the
point, in sentence case, shorter than 120 characters and in an imperative tone -- an entry should complete the sentence
``This change will …``. In rare cases, where one line is not enough, use a summary line in an imperative tone followed
by a blank line separating it from a description of the feature/change in one or more paragraphs, each wrapped
diff --git a/docs/index.rst b/docs/index.rst
index 843b206..b7963f0 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -83,4 +83,4 @@ Useful links
cli_interface
extend
development
- changes
+ changelog
diff --git a/pyproject.toml b/pyproject.toml
index 11cf55f..4690b87 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -19,7 +19,7 @@ line-length = 120
[tool.towncrier]
package = "virtualenv"
package_dir = "" # we purposfully do not set this as src, forcing import from site-package that has version.py
- filename = "docs/changes.rst"
+ filename = "docs/changelog.rst"
directory = "docs/changelog"
title_format = false
issue_format = "`#{issue} <https://github.com/pypa/virtualenv/issues/{issue}>`_"
diff --git a/tox.ini b/tox.ini
index bed2529..155fc68 100644
--- a/tox.ini
+++ b/tox.ini
@@ -58,7 +58,7 @@ commands =
coverage report --show-missing
coverage xml -o {toxworkdir}/coverage.xml
coverage html -d {toxworkdir}/htmlcov
- diff-cover --compare-branch {env:DIFF_AGAINST:origin/rewrite} {toxworkdir}/coverage.xml
+ diff-cover --compare-branch {env:DIFF_AGAINST:origin/master} {toxworkdir}/coverage.xml
depends =
py38,
py37,
@@ -130,7 +130,6 @@ max-line-length = 120
[testenv:release]
description = do a release, required posarg of the version number
basepython = python3.8
-skip_install = true
passenv = *
deps =
{[testenv]deps}