From ad804626c464d176c350f5e9232da22ca900dff1 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 31 Jan 2018 09:04:59 +0100 Subject: [PATCH] Update requirements manually The global requirments sync for this repo fails since it lists packages that are not in the global list. Manually sync requirements. Failure log from requirements sync: http://logs.openstack.org/d8/d89aad257d43fe02e42e44b2a0187dbd9f505c36/post/propose-update-requirements/15a7777/job-output.txt.gz#_2018-01-31_06_51_56_655451 Errors are: 'discover' is not in global-requirements.txt or blacklist.txt 'dpath' is not in global-requirements.txt or blacklist.txt 'salt' is not in global-requirements.txt or blacklist.txt 'yamllint' is not in global-requirements.txt or blacklist.txt Change-Id: Ifbd174d568b0cae5225faa6e25b1bc5fc4774e6e --- requirements.txt | 3 +++ setup.py | 15 +++++++++++++-- test-requirements.txt | 35 +++++++++++++++++++---------------- 3 files changed, 35 insertions(+), 18 deletions(-) diff --git a/requirements.txt b/requirements.txt index e69de29..9dbc011 100644 --- a/requirements.txt +++ b/requirements.txt @@ -0,0 +1,3 @@ +# The order of packages is significant, because pip processes them in the order +# of appearance. Changing the order has an impact on the overall integration +# process, which may cause wedges in the gate later. diff --git a/setup.py b/setup.py index 93952d8..566d844 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,5 @@ -#!/usr/bin/env python +# Copyright (c) 2013 Hewlett-Packard Development Company, L.P. +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -11,8 +12,18 @@ # implied. # See the License for the specific language governing permissions and # limitations under the License. + +# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT import setuptools +# In python < 2.7.4, a lazy loading of package `pbr` will break +# setuptools if some other modules registered functions in `atexit`. +# solution from: http://bugs.python.org/issue15881#msg170215 +try: + import multiprocessing # noqa +except ImportError: + pass + setuptools.setup( - setup_requires=['pbr'], + setup_requires=['pbr>=2.0.0'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index acfaf6a..b35c1ca 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,23 +1,26 @@ -coverage>=4.0 # Apache-2.0 +# The order of packages is significant, because pip processes them in the order +# of appearance. Changing the order has an impact on the overall integration +# process, which may cause wedges in the gate later. +coverage!=4.4,>=4.0 # Apache-2.0 discover dpath>=1.3.2 -fixtures>=3.0.0 # Apache-2.0/BSD +fixtures>=3.0.0 # Apache-2.0/BSD # Hacking already pins down pep8, pyflakes and flake8 -hacking>=0.12.0,!=0.13.0,<0.14 # Apache-2.0 -mock>=2.0 # BSD -openstackdocstheme>=1.11.0 # Apache-2.0 -paunch>=1.0.0 # Apache-2.0 +hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 +mock>=2.0.0 # BSD +openstackdocstheme>=1.18.1 # Apache-2.0 +paunch>=1.0.0 # Apache-2.0 reno>=2.5.0 # Apache-2.0 -requests>=2.10.0,!=2.12.2,!=2.13.0 # Apache-2.0 -requests-mock>=1.1 # Apache-2.0 +requests>=2.14.2 # Apache-2.0 +requests-mock>=1.1.0 # Apache-2.0 salt -sphinx>=1.6.2 # BSD -testrepository>=0.0.18 -testscenarios>=0.4 -testtools>=1.4.0 # MIT +sphinx!=1.6.6,>=1.6.2 # BSD +testrepository>=0.0.18 # Apache-2.0/BSD +testscenarios>=0.4 # Apache-2.0/BSD +testtools>=2.2.0 # MIT yamllint>=1.2.0 -os-apply-config # Apache-2.0 +os-apply-config>=5.0.0 # Apache-2.0 -python-heatclient>=1.6.1 # Apache-2.0 -python-keystoneclient>=3.8.0 # Apache-2.0 -python-openstackclient>=3.3.0 # Apache-2.0 +python-heatclient>=1.10.0 # Apache-2.0 +python-keystoneclient>=3.8.0 # Apache-2.0 +python-openstackclient>=3.12.0 # Apache-2.0