summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2017-09-03 11:48:36 -0400
committerJason R. Coombs <jaraco@jaraco.com>2017-09-03 11:48:36 -0400
commit1bf3ca0bfb958f857f8c85eb01cd64ddae23e4ab (patch)
tree3a78a790d7513eb6caf1cda8c611917d151fc2b4
parentcf5b062fe0978d7b68b57c12b4d7f4fae4469c1e (diff)
downloadpytest-runner-1bf3ca0bfb958f857f8c85eb01cd64ddae23e4ab.tar.gz
Update changelog.
-rw-r--r--CHANGES.rst9
-rw-r--r--docs/conf.py4
2 files changed, 13 insertions, 0 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 7e56ea9..21132ef 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+2.12
+~~~~
+
+* #30: Rework support for ``--allow-hosts`` and
+ ``--index-url``, removing dependence on
+ ``setuptools.Distribution``'s private member.
+ Additionally corrects logic in marker evaluation
+ along with unit tests!
+
2.11.1
~~~~~~
diff --git a/docs/conf.py b/docs/conf.py
index e6af71f..1df2380 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -49,6 +49,10 @@ link_files = {
pattern=r"PEP[- ](?P<pep_number>\d+)",
url='https://www.python.org/dev/peps/pep-{pep_number:0>4}/',
),
+ dict(
+ pattern=r"Setuptools #(?P<setuptools_issue>\d+)",
+ url='https://github.com/pypa/setuptools/issues/{setuptools_issue}/',
+ ),
],
),
}