Merge pull request #3045 from hugovk/rm-3.3

[MRG+1] Drop support for EOL Python 3.3
This commit is contained in:
Mikhail Korobov 2017-12-20 21:08:13 +05:00 committed by GitHub
commit bdc12f3994
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 18 deletions

View File

@ -13,8 +13,8 @@ matrix:
env: TOXENV=jessie
- python: 2.7
env: TOXENV=pypy
- python: 3.3
env: TOXENV=py33
- python: 3.4
env: TOXENV=py34
- python: 3.5
env: TOXENV=py35
- python: 3.6

View File

@ -6,6 +6,10 @@ Scrapy
:target: https://pypi.python.org/pypi/Scrapy
:alt: PyPI Version
.. image:: https://img.shields.io/pypi/pyversions/Scrapy.svg
:target: https://pypi.python.org/pypi/Scrapy
:alt: Supported Python Versions
.. image:: https://img.shields.io/travis/scrapy/scrapy/master.svg
:target: https://travis-ci.org/scrapy/scrapy
:alt: Build Status
@ -36,7 +40,7 @@ https://scrapy.org
Requirements
============
* Python 2.7 or Python 3.3+
* Python 2.7 or Python 3.4+
* Works on Linux, Windows, Mac OSX, BSD
Install

View File

@ -69,7 +69,7 @@ Here's an example spider using BeautifulSoup API, with ``lxml`` as the HTML pars
What Python versions does Scrapy support?
-----------------------------------------
Scrapy is supported under Python 2.7 and Python 3.3+.
Scrapy is supported under Python 2.7 and Python 3.4+.
Python 2.6 support was dropped starting at Scrapy 0.20.
Python 3 support was added in Scrapy 1.1.

View File

@ -7,7 +7,7 @@ Installation guide
Installing Scrapy
=================
Scrapy runs on Python 2.7 and Python 3.3 or above.
Scrapy runs on Python 2.7 and Python 3.4 or above.
If you're using `Anaconda`_ or `Miniconda`_, you can install the package from
the `conda-forge`_ channel, which has up-to-date packages for Linux, Windows
@ -132,12 +132,12 @@ Once you've installed `Anaconda`_ or `Miniconda`_, install Scrapy with::
.. _intro-install-ubuntu:
Ubuntu 12.04 or above
Ubuntu 14.04 or above
---------------------
Scrapy is currently tested with recent-enough versions of lxml,
twisted and pyOpenSSL, and is compatible with recent Ubuntu distributions.
But it should support older versions of Ubuntu too, like Ubuntu 12.04,
But it should support older versions of Ubuntu too, like Ubuntu 14.04,
albeit with potential issues with TLS connections.
**Don't** use the ``python-scrapy`` package provided by Ubuntu, they are
@ -163,8 +163,8 @@ you can install Scrapy with ``pip`` after that::
pip install scrapy
.. note::
The same non-python dependencies can be used to install Scrapy in Debian
Wheezy (7.0) and above.
The same non-Python dependencies can be used to install Scrapy in Debian
Jessie (8.0) and above.
.. _intro-install-macos:

View File

@ -53,7 +53,6 @@ setup(
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
@ -61,6 +60,7 @@ setup(
'Topic :: Software Development :: Libraries :: Application Frameworks',
'Topic :: Software Development :: Libraries :: Python Modules',
],
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
install_requires=[
'Twisted>=13.1.0',
'w3lib>=1.17.0',

12
tox.ini
View File

@ -63,25 +63,21 @@ basepython = pypy
commands =
py.test {posargs:scrapy tests}
[testenv:py33]
basepython = python3.3
[testenv:py34]
basepython = python3.4
deps =
-rrequirements-py3.txt
# Extras
Pillow
-rtests/requirements-py3.txt
[testenv:py34]
basepython = python3.4
deps = {[testenv:py33]deps}
[testenv:py35]
basepython = python3.5
deps = {[testenv:py33]deps}
deps = {[testenv:py34]deps}
[testenv:py36]
basepython = python3.6
deps = {[testenv:py33]deps}
deps = {[testenv:py34]deps}
[docs]
changedir = docs