From eb6f87f8f63af26ee52276885b98c695de9503d8 Mon Sep 17 00:00:00 2001 From: Tony Breeds Date: Fri, 8 Apr 2016 12:47:02 +1000 Subject: [PATCH] Manual update from global-requirements In Ib88adcf0a6ef09349aefd6fba981a399a73ed8dd smaug is added to projects.txt. This change manually runs the update code to make sure that smaug-dashboard is ready for inclusion in projects.txt Change-Id: I1dcae80b2a7e778af624eaa2b86ab2a9b5c8e6da --- requirements.txt | 12 ++++++------ setup.py | 1 - test-requirements.txt | 28 ++++++++++++++-------------- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/requirements.txt b/requirements.txt index dc39d8f..11c1c54 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,12 +7,12 @@ # be installed in a specific order. # # PBR should always appear first -pbr>=1.6 # Apache-2.0 -Babel>=1.3 # BSD -Django>=1.8,<1.9 # BSD -django-babel>=0.4.0 # BSD -django_compressor>=2.0 # MIT -django_openstack_auth>=2.0.0 # Apache-2.0 +pbr>=1.6 # Apache-2.0 +Babel>=1.3 # BSD +Django<1.9,>=1.8 # BSD +django-babel>=0.4.0 # BSD +django-compressor>=2.0 # MIT +django-openstack-auth>=2.0.0 # Apache-2.0 django-pyscss>=2.0.2 # BSD License (2 clause) XStatic>=1.0.0 # MIT License XStatic-Angular>=1.3.7 # MIT License diff --git a/setup.py b/setup.py index a78f225..782bb21 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/test-requirements.txt b/test-requirements.txt index 84a3315..e78e2bd 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,21 +7,21 @@ # be installed in a specific order. # # Hacking should appear first in case something else depends on pep8 -hacking>=0.10.2,<0.11 # Apache-2.0 -coverage>=3.6 # Apache-2.0 -django-nose>=1.2 # BSD -mock>=1.2 # BSD -mox3>=0.7.0 # Apache-2.0 +hacking<0.11,>=0.10.2 # Apache-2.0 +coverage>=3.6 # Apache-2.0 +django-nose>=1.2 # BSD +mock>=1.2 # BSD +mox3>=0.7.0 # Apache-2.0 nodeenv>=0.9.4 # BSD License # BSD -nose # LGPL -nose-exclude # LGPL -nosehtmloutput>=0.0.3 # Apache-2.0 -nosexcover # BSD -openstack.nose-plugin>=0.7 # Apache-2.0 -oslosphinx>=2.5.0,!=3.4.0 # Apache-2.0 -selenium>=2.50.1 # Apache-2.0 -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 # BSD -testtools>=1.4.0 # MIT +nose # LGPL +nose-exclude # LGPL +nosehtmloutput>=0.0.3 # Apache-2.0 +nosexcover # BSD +openstack.nose-plugin>=0.7 # Apache-2.0 +oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 +selenium>=2.50.1 # Apache-2.0 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD +testtools>=1.4.0 # MIT # This also needs xvfb library installed on your OS xvfbwrapper>=0.1.3 #license: MIT # Include horizon as test requirement