summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSumit Naiksatam <sumitnaiksatam@gmail.com>2016-02-22 12:10:17 -0800
committerSumit Naiksatam <sumitnaiksatam@gmail.com>2016-02-22 12:10:36 -0800
commit1ec1bec0a6ff82149c030b1df68fb7cf2f09630c (patch)
tree7a69954175ae69253163dc72655514af8b712263
parentdd5fa44d7cd2f58f65e92c4d176f9f576f6d1e88 (diff)
Syncing with mitaka dependencies
Notes
Notes (review): Code-Review+2: Hemanth Ravi <hemanth.ravi@oneconvergence.com> Code-Review+2: Subrahmanyam Ongole <songole@oneconvergence.com> Workflow+1: Subrahmanyam Ongole <songole@oneconvergence.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 02 Mar 2016 20:05:39 +0000 Reviewed-on: https://review.openstack.org/283236 Project: openstack/group-based-policy-automation Branch: refs/heads/master
-rw-r--r--requirements.txt1
-rwxr-xr-xsetup.py11
-rw-r--r--test-requirements.txt31
3 files changed, 26 insertions, 17 deletions
diff --git a/requirements.txt b/requirements.txt
index c299e3b..2594ccb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,4 +2,5 @@
2# of appearance. Changing the order has an impact on the overall integration 2# of appearance. Changing the order has an impact on the overall integration
3# process, which may cause wedges in the gate later. 3# process, which may cause wedges in the gate later.
4 4
5pbr>=1.6 # Apache-2.0
5Babel>=1.3 6Babel>=1.3
diff --git a/setup.py b/setup.py
index 70c2b3f..782bb21 100755
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,3 @@
1#!/usr/bin/env python
2# Copyright (c) 2013 Hewlett-Packard Development Company, L.P. 1# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
3# 2#
4# Licensed under the Apache License, Version 2.0 (the "License"); 3# Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +16,14 @@
17# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT 16# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
18import setuptools 17import setuptools
19 18
19# In python < 2.7.4, a lazy loading of package `pbr` will break
20# setuptools if some other modules registered functions in `atexit`.
21# solution from: http://bugs.python.org/issue15881#msg170215
22try:
23 import multiprocessing # noqa
24except ImportError:
25 pass
26
20setuptools.setup( 27setuptools.setup(
21 setup_requires=['pbr'], 28 setup_requires=['pbr>=1.8'],
22 pbr=True) 29 pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index 6061981..9b001d1 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,23 +2,24 @@
2# of appearance. Changing the order has an impact on the overall integration 2# of appearance. Changing the order has an impact on the overall integration
3# process, which may cause wedges in the gate later. 3# process, which may cause wedges in the gate later.
4 4
5-e git://github.com/openstack/heat.git@stable/liberty#egg=heat 5-e git://github.com/openstack/heat.git@master#egg=heat
6-e git://git.openstack.org/openstack/python-group-based-policy-client.git@master#egg=gbpclient 6-e git://git.openstack.org/openstack/python-group-based-policy-client.git@master#egg=gbpclient
7# Hacking already pins down pep8, pyflakes and flake8 7# Hacking already pins down pep8, pyflakes and flake8
8hacking<0.11,>=0.10.0 8hacking<0.11,>=0.10.0
9coverage>=3.6 9bandit>=0.17.3 # Apache-2.0
10mock>=1.2 10coverage>=3.6 # Apache-2.0
11mox>=0.5.3 11kombu>=3.0.25 # BSD
12mox3>=0.7.0 12mock>=1.2 # BSD
13mox3>=0.7.0 # Apache-2.0
13PyMySQL>=0.6.2 # MIT License 14PyMySQL>=0.6.2 # MIT License
14oslosphinx>=2.5.0 # Apache-2.0 15oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
15oslotest>=1.10.0 # Apache-2.0 16oslotest>=1.10.0 # Apache-2.0
16paramiko>=1.13.0 17paramiko>=1.16.0 # LGPL
17qpid-python;python_version=='2.7' 18qpid-python;python_version=='2.7' # Apache-2.0
18psycopg2>=2.5 19psycopg2>=2.5 # LGPL/ZPL
19reno[sphinx]>=0.1.1 # Apache2 20sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
20sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 21testrepository>=0.0.18 # Apache-2.0/BSD
21testrepository>=0.0.18 22testscenarios>=0.4 # Apache-2.0/BSD
22testscenarios>=0.4 23testtools>=1.4.0 # MIT
23testtools>=1.4.0 24testresources>=0.2.4 # Apache-2.0/BSD
24testresources>=0.2.4 25reno>=0.1.1 # Apache2