Skip to content

Commit

Permalink
Drop support for EOL Python 3.3
Browse files Browse the repository at this point in the history
  • Loading branch information
hugovk committed Dec 21, 2017
1 parent e70ec5a commit 36de72b
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 37 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ matrix:
include:
- python: 2.7
env: TOX_ENV=py27
- python: 3.3
env: TOX_ENV=py33
- python: 3.4
env: TOX_ENV=py34
- python: 3.5
Expand Down
15 changes: 2 additions & 13 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@ Before you submit a pull request, check that it meets these guidelines:
2. If the pull request adds functionality, the docs should be updated. Put
your new functionality into a function with a docstring, and add the
feature to the list in README.rst.
3. The pull request should work for Python 2.7, 3.3, 3.4, 3.5, 3.6, and PyPy on
Appveyor and Travis CI.
3. The pull request should work for Python 2.7, 3.4, 3.5, 3.6, and PyPy on
AppVeyor and Travis CI.
4. Check https://travis-ci.org/audreyr/cookiecutter/pull_requests and
https://ci.appveyor.com/project/audreyr/cookiecutter/history to ensure the tests pass for all supported Python versions and platforms.

Expand Down Expand Up @@ -226,17 +226,6 @@ is::
Will run py.test with the python2.7, python3.4 and pypy interpreters, for
example.

Troubleshooting for Contributors
--------------------------------

Python 3.3 tests fail locally
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Try upgrading Tox to the latest version. I noticed that they were failing
locally with Tox 1.5 but succeeding when I upgraded to Tox 1.7.1.

.. _`pytest usage docs`: https://pytest.org/latest/usage.html#specifying-tests-selecting-tests



Core Committer Guide
Expand Down
5 changes: 4 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ Cookiecutter
.. image:: https://img.shields.io/pypi/v/cookiecutter.svg
:target: https://pypi.python.org/pypi/cookiecutter

.. image:: https://img.shields.io/pypi/pyversions/cookiecutter.svg
:target: https://pypi.python.org/pypi/cookiecutter

.. image:: https://travis-ci.org/audreyr/cookiecutter.svg?branch=master
:target: https://travis-ci.org/audreyr/cookiecutter

Expand Down Expand Up @@ -48,7 +51,7 @@ Did someone say features?

* Cross-platform: Windows, Mac, and Linux are officially supported.

* Works with Python 2.7, 3.3, 3.4, 3.5, 3.6, and PyPy. *(But you don't have to
* Works with Python 2.7, 3.4, 3.5, 3.6, and PyPy. *(But you don't have to
know/write Python code to use Cookiecutter.)*

* Project templates can be in any programming language or markup format:
Expand Down
6 changes: 0 additions & 6 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,6 @@ environment:
- PYTHON: "C:\\Python27-x64"
TOX_ENV: "py27"

- PYTHON: "C:\\Python33"
TOX_ENV: "py33"

- PYTHON: "C:\\Python33-x64"
TOX_ENV: "py33"

- PYTHON: "C:\\Python34"
TOX_ENV: "py34"

Expand Down
11 changes: 0 additions & 11 deletions docs/contributor_testing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,3 @@ is::

Will run py.test with the python2.7, python3.4 and pypy interpreters, for
example.

Troubleshooting for Contributors
--------------------------------

Python 3.3 tests fail locally
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Try upgrading Tox to the latest version. I noticed that they were failing
locally with Tox 1.5 but succeeding when I upgraded to Tox 1.7.1.

.. _`pytest usage docs`: https://docs.pytest.org/en/latest/usage.html#specifying-tests-selecting-tests
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
]
},
include_package_data=True,
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
install_requires=requirements,
license='BSD',
zip_safe=False,
Expand All @@ -71,7 +72,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
4 changes: 2 additions & 2 deletions test_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pytest<3.3.0
pytest
pytest-cov
pytest-mock==1.1
pytest-mock
pytest-catchlog
freezegun
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py27, py33, py34, py35, py36, pypy, flake8
envlist = py27, py34, py35, py36, pypy, flake8

[testenv]
passenv = LC_ALL, LANG, HOME
Expand Down

0 comments on commit 36de72b

Please sign in to comment.