diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2018-02-20 07:55:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-20 07:55:33 -0500 |
| commit | bda9386ddbde71745b8447300b210c5fc78a2c2b (patch) | |
| tree | a263f9516d172a243d92ae289ac273b238a95797 | |
| parent | 271dee89e1ec9740c008f1938aa896616e164ede (diff) | |
| parent | 0d99729166cc722bc86a1284141f45ab34bca793 (diff) | |
| download | external_python_setuptools-bda9386ddbde71745b8447300b210c5fc78a2c2b.tar.gz external_python_setuptools-bda9386ddbde71745b8447300b210c5fc78a2c2b.tar.bz2 external_python_setuptools-bda9386ddbde71745b8447300b210c5fc78a2c2b.zip | |
Merge pull request #1278 from vphilippon/fix-doc-version-spec-inconsistencies
Fix documentation inconsistency on version specifier
| -rw-r--r-- | docs/pkg_resources.txt | 2 | ||||
| -rw-r--r-- | docs/setuptools.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt index 8d337cb2..b40a209f 100644 --- a/docs/pkg_resources.txt +++ b/docs/pkg_resources.txt @@ -638,7 +638,7 @@ Requirements Parsing sorted into ascending version order, and used to establish what ranges of versions are acceptable. Adjacent redundant conditions are effectively consolidated (e.g. ``">1, >2"`` produces the same results as ``">2"``, and - ``"<2,<3"`` produces the same results as``"<2"``). ``"!="`` versions are + ``"<2,<3"`` produces the same results as ``"<2"``). ``"!="`` versions are excised from the ranges they fall within. The version being tested for acceptability is then checked for membership in the resulting ranges. diff --git a/docs/setuptools.txt b/docs/setuptools.txt index cebb6268..2425e100 100644 --- a/docs/setuptools.txt +++ b/docs/setuptools.txt @@ -571,7 +571,7 @@ project name or version identifier must be replaced with ``-``. Version specifiers for a given project are internally sorted into ascending version order, and used to establish what ranges of versions are acceptable. Adjacent redundant conditions are also consolidated (e.g. ``">1, >2"`` becomes -``">1"``, and ``"<2,<3"`` becomes ``"<3"``). ``"!="`` versions are excised from +``">2"``, and ``"<2,<3"`` becomes ``"<2"``). ``"!="`` versions are excised from the ranges they fall within. A project's version is then checked for membership in the resulting ranges. (Note that providing conflicting conditions for the same version (e.g. "<2,>=2" or "==2,!=2") is meaningless and may |