diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 9acc83287..efff1fad9 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -39,9 +39,9 @@ To run all tests using various versions of python in virtualenvs defined in tox. It is possible to tests with some versions of python, to do this the command is:: - $ tox -e py27,py34 + $ tox -e py34,py35 -Will run py.test with the python2.7, and python3.4 interpreters, for +Will run py.test with the python3.4, and python3.5 interpreters, for example. To run a particular test with tox for against your current Python version:: diff --git a/README.rst b/README.rst index d38280eca..68d6088dc 100644 --- a/README.rst +++ b/README.rst @@ -29,8 +29,9 @@ Features --------- * For Django 1.10 +* Works with Python 3.4.x or 3.5.x. Python 3.6 is experimenta * Renders Django projects with 100% starting test coverage -* Twitter Bootstrap_ v4.0.0 - `alpha 4`_ (`maintained Foundation fork`_ also available) +* Twitter Bootstrap_ v4.0.0 - alpha 6 (`maintained Foundation fork`_ also available) * 12-Factor_ based settings via django-environ_ * Secure by default. We believe in SSL. * Optimized development and production settings @@ -42,7 +43,6 @@ Features * Docker support using docker-compose_ for development and production * Procfile_ for deploying to Heroku * Instructions for deploying to PythonAnywhere_ -* Works with Python 2.7.x or 3.5.x * Run tests with unittest or py.test * Customizable PostgreSQL version * Experimental support for Amazon Elastic Beanstalk @@ -61,7 +61,6 @@ Optional Integrations * Integration with Sentry_ for error logging * Integration with Opbeat_ for performance monitoring -.. _`alpha 4`: http://blog.getbootstrap.com/2016/09/05/bootstrap-4-alpha-4/ .. _Bootstrap: https://github.com/twbs/bootstrap .. _django-environ: https://github.com/joke2k/django-environ .. _12-Factor: http://12factor.net/ diff --git a/docs/deployment-on-pythonanywhere.rst b/docs/deployment-on-pythonanywhere.rst index 661170722..07b46bc05 100644 --- a/docs/deployment-on-pythonanywhere.rst +++ b/docs/deployment-on-pythonanywhere.rst @@ -35,7 +35,7 @@ Make sure your project is fully commited and pushed up to Bitbucket or Github or git clone # you can also use hg cd my-project-name - mkvirtualenv --python=/usr/bin/python3.5 my-project-name # or python2.7, etc + mkvirtualenv --python=/usr/bin/python3.5 my-project-name pip install -r requirements/production.txt # may take a few minutes diff --git a/setup.py b/setup.py index 13749203a..805d75f1a 100644 --- a/setup.py +++ b/setup.py @@ -40,7 +40,6 @@ setup( 'License :: OSI Approved :: BSD License', 'Programming Language :: Python', 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5',