openstack
/
horizon
Code Issues Proposed changes

Merge "Remove Python 2.6 classifier"

This commit is contained in:
Jenkins 2014-12-08 17:30:50 +00:00 committed by Gerrit Code Review
parent 876c950340 b7f40060ba
commit bc26f976c7
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/topics/install.rst
View File

@ -9,7 +9,7 @@ This page covers the basic installation of Horizon.
System Requirements
===================
* Python 2.7 (or 2.6)
* Python 2.7
* Django 1.6 (1.4 and 1.5 are supported too)
* Minimum required set of running OpenStack services are:

1
setup.cfg
View File

@ -20,7 +20,6 @@ classifier =
Programming Language :: Python
Programming Language :: Python :: 2
Programming Language :: Python :: 2.7
Programming Language :: Python :: 2.6
Topic :: Internet :: WWW/HTTP
[global]

6
tox.ini
View File

@ -1,5 +1,5 @@
[tox]
envlist = py26,py27,py27dj14,py27dj15,pep8,py33,py34
envlist = py27,py27dj14,py27dj15,pep8,py33,py34
minversion = 1.6
skipsdist = True
@ -44,10 +44,6 @@ commands = pip install django>=1.5,<1.6
basepython = python2.7
commands = /bin/bash run_tests.sh -N --integration --selenium-headless {posargs}
[testenv:py26integration]
basepython = python2.6
commands = /bin/bash run_tests.sh -N --integration --selenium-headless {posargs}
[testenv:jshint]
commands = nodeenv -p
npm install jshint -g