jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/430021 )
Change subject: Deprecate requests-requirements.txt
......................................................................
Deprecate requests-requirements.txt
We have too many requirements files which makes keeping them in sync
hard. Start by deprecating requests-requirements.txt and use setup.py's
extra dependency groups instead.
pywikibot[security] installs requests[security] and pycparser!=2.14.
requests[security] installs pyOpenSSL>=0.14, cryptography>=1.3.4,
and idna>=2.0.0.[1]
This means that pywikibot[security] covers all the requirements in
requests-requirements.txt.
[1]:
https://github.com/requests/requests/blob/master/setup.py#L98
Bug: T193476
Change-Id: I0d889513ac406206a977acc992c6deb8fd4a32b2
---
M .appveyor.yml
M .travis.yml
M CONTENT.rst
M docs/requirements-py3.txt
M requests-requirements.txt
M tox.ini
6 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Dvorapa: Looks good to me, but someone else must approve
Xqt: Looks good to me, approved
Dalba: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.appveyor.yml b/.appveyor.yml
index 79ede46..c733ec3 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -85,7 +85,7 @@
- virtualenv env
- env\Scripts\activate.bat
- pip install -r dev-requirements.txt
- - pip install -r requests-requirements.txt
+ - pip install -e .[security]
build: off
diff --git a/.travis.yml b/.travis.yml
index cdd20c0..668d9af 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,7 +54,7 @@
script:
# Install security packages for requests to support HTTPS in site_detect
- if [[ "$PYSETUP_TEST_EXTRAS" != '1' ]]; then
- pip install mwoauth!=0.3.1 -r requests-requirements.txt ;
+ pip install -e .[mwoauth,security];
fi
- mkdir ~/.pywikibot
diff --git a/CONTENT.rst b/CONTENT.rst
index 769e7fa..add8f4b 100644
--- a/CONTENT.rst
+++ b/CONTENT.rst
@@ -34,8 +34,6 @@
| README-conversion.txt | Guide to converting bot scripts from version 1 |
| | of the Pywikibot framework to version 3 |
+---------------------------+------------------------------------------------------+
- | requests-requirements.txt | PIP requirements file for Appveyor builds |
- +---------------------------+------------------------------------------------------+
| requirements.txt | General PIP requirements file |
+---------------------------+------------------------------------------------------+
| setup.py | Installer script for Pywikibot 3.0 framework |
diff --git a/docs/requirements-py3.txt b/docs/requirements-py3.txt
index 215008f..f1ccf45 100644
--- a/docs/requirements-py3.txt
+++ b/docs/requirements-py3.txt
@@ -1,6 +1,6 @@
# This is a PIP requirements file for building Sphinx documentation of pywikibot
# using sphinx on python3.4.
-# requirements.txt and requests-requirements.txt are also needed
+# requirements.txt and pywikibot[security] are also needed
sphinx
sphinx-epytext>=0.0.4
diff --git a/requests-requirements.txt b/requests-requirements.txt
index cf986cd..a1e6994 100644
--- a/requests-requirements.txt
+++ b/requests-requirements.txt
@@ -1,3 +1,5 @@
+# This file is DEPRECATED! Use `pip install pywikibot[security]` instead.
+
requests>=2.9,!=2.18.2
# requests security extra
diff --git a/tox.ini b/tox.ini
index bd0cf03..9e092a8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -128,12 +128,12 @@
[testenv:doc]
commands =
+ pip install -e .[security]
make html -C ./docs
findx -type f -name '*.rst' -not -path './.tox/*' : rstcheck --report
warning --ignore-directives automodule,autoclass,autofunction
basepython = python3.4
deps =
-rrequirements.txt
- -rrequests-requirements.txt
-rdocs/requirements-py3.txt
findx >= 0.9.9
rstcheck
--
To view, visit
https://gerrit.wikimedia.org/r/430021
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I0d889513ac406206a977acc992c6deb8fd4a32b2
Gerrit-Change-Number: 430021
Gerrit-PatchSet: 12
Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com>
Gerrit-Reviewer: jenkins-bot <>