Skip to content

Commit

Permalink
Deprecate requests-requirements.txt
Browse files Browse the repository at this point in the history
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
  • Loading branch information
5j9 committed May 2, 2018
1 parent 7697871 commit dbac870
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ install:
- virtualenv env
- env\Scripts\activate.bat
- pip install -r dev-requirements.txt
- pip install -r requests-requirements.txt
- pip install -e .[security]

build: off

Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ before_script:
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
Expand Down
2 changes: 0 additions & 2 deletions CONTENT.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ The contents of the package
| 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 |
Expand Down
2 changes: 1 addition & 1 deletion docs/requirements-py3.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions requests-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# This file is DEPRECATED! Use `pip install pywikibot[security]` instead.

requests>=2.9,!=2.18.2

# requests security extra
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,12 @@ commands = {posargs}

[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
Expand Down

0 comments on commit dbac870

Please sign in to comment.