Skip to content

Commit

Permalink
Merge pull request #1804 from davidmarin/drop-python-3.3
Browse files Browse the repository at this point in the history
Drop support for Python 3.3
  • Loading branch information
David Marin committed Jul 18, 2018
2 parents 56a0e74 + 3d527be commit 375ced8
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 12 deletions.
8 changes: 3 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,20 @@ language: python
python:
- "2.7"
- "pypy"
- "3.3"
- "3.4"
- "3.5"
- "3.6"
- "3.6-dev"
# - "nightly"
- "3.7-dev"
- "nightly"
matrix:
allow-failures:
- python: "3.5-dev"
- python: "3.7-dev"
- python: "nightly"
fast_finish: true
install:
- "pip install ."
- "pip install ujson warcio"
- "pip install rapidjson || true"
- "if [[ $TRAVIS_PYTHON_VERSION == 3.3 ]]; then pip install virtualenv==15.2.0; fi"
# command to run tests
script: python -m unittest discover -v
sudo: false
3 changes: 3 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
v0.6.4, 2018-??-?? -- ???
* drop support for Python 3.3

v0.6.3, 2018-05-31 -- Dataproc parity
* jobs:
* use mapper_raw() to read entire file, in any format (#754)
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ mrjob: the Python MapReduce library

.. image:: https://github.com/Yelp/mrjob/raw/master/docs/logos/logo_medium.png

mrjob is a Python 2.7/3.3+ package that helps you write and run Hadoop
mrjob is a Python 2.7/3.4+ package that helps you write and run Hadoop
Streaming jobs.

`Stable version (v0.6.3) documentation <http://mrjob.readthedocs.org/en/stable/>`_
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
mrjob
=====

**mrjob lets you write MapReduce jobs in Python 2.7/3.3+ and run them on
**mrjob lets you write MapReduce jobs in Python 2.7/3.4+ and run them on
several platforms.** You can:

* Write multi-step MapReduce jobs in pure Python
Expand Down
5 changes: 0 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@
setuptools_kwargs['extras_require']['rapidjson'] = ['rapidjson']
setuptools_kwargs['tests_require'].append('rapidjson')

# mock is included in Python 3.3 as unittest.mock
if sys.version_info < (3, 3):
setuptools_kwargs['tests_require'].append('mock')

# grpc requires enum, which is a builtin starting in Python 3.4
if sys.version_info >= (3, 0) and sys.version_info < (3, 4):
setuptools_kwargs['install_requires'].append('enum34')
Expand All @@ -75,7 +71,6 @@
'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',
Expand Down

0 comments on commit 375ced8

Please sign in to comment.