From 41254a3578ad4605906abda01e5b774f528c002a Mon Sep 17 00:00:00 2001 From: Andreas Jaeger <aj@suse.com> Date: Wed, 31 Jan 2018 09:01:37 +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_47_53_939490 Errors are: 'jsonpickle' is not in global-requirements.txt or blacklist.txt 'mongomock' is not in global-requirements.txt or blacklist.txt Change-Id: I4c99bca201da092d872ead25e96c41f0d8c94ddf --- requirements.txt | 31 +++++++++++++++++-------------- setup.py | 25 +++++++++++++++++-------- test-requirements.txt | 19 +++++++++++-------- 3 files changed, 45 insertions(+), 30 deletions(-) diff --git a/requirements.txt b/requirements.txt index 21eb7c4..97eba95 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,15 +1,18 @@ -pbr>=1.8 # Apache-2.0 -Flask>=0.10,!=0.11,<1.0 # BSD +# 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. +pbr!=2.1.0,>=2.0.0 # Apache-2.0 +Flask!=0.11,<1.0,>=0.10 # BSD jsonpickle==0.7.1 -pymongo>=3.0.2,!=3.1 # Apache-2.0 -pytz>=2013.6 # MIT -voluptuous>=0.8.9 # BSD License -keystoneauth1>=2.14.0 # Apache-2.0 -python-keystoneclient>=3.8.0 # Apache-2.0 -six>=1.9.0 # MIT -kombu>=4.0.0,!=4.0.2 # BSD -oslo.serialization>=1.10.0 # Apache-2.0 -oslo.config>=3.14.0 # Apache-2.0 -oslo.log>=3.11.0 # Apache-2.0 -oslo.messaging>=5.14.0 # Apache-2.0 -oslo.service>=1.10.0 # Apache-2.0 +pymongo!=3.1,>=3.0.2 # Apache-2.0 +pytz>=2013.6 # MIT +voluptuous>=0.8.9 # BSD License +keystoneauth1>=3.3.0 # Apache-2.0 +python-keystoneclient>=3.8.0 # Apache-2.0 +six>=1.10.0 # MIT +kombu!=4.0.2,>=4.0.0 # BSD +oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0 +oslo.config>=5.1.0 # Apache-2.0 +oslo.log>=3.36.0 # Apache-2.0 +oslo.messaging>=5.29.0 # Apache-2.0 +oslo.service!=1.28.1,>=1.24.0 # Apache-2.0 diff --git a/setup.py b/setup.py index 06f694d..566d844 100644 --- a/setup.py +++ b/setup.py @@ -1,20 +1,29 @@ -# Copyright 2016 Internap. +# 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 # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. # See the License for the specific language governing permissions and # limitations under the License. -from setuptools import setup +# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT +import setuptools -setup( - setup_requires=['pbr'], - pbr=True, -) +# 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>=2.0.0'], + pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 0274c34..ce39c00 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,9 +1,12 @@ +# 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. mongomock==2.0.0 -nose # LGPL -setuptools>=16.0,!=24.0.0 # PSF/ZPL -sphinx>=1.2.1,!=1.3b1,<1.3 # BSD -flake8>=2.5.4,<2.6.0 # MIT -hacking<0.12,>=0.11.0 # Apache-2.0 -testtools>=1.4.0 # MIT -mock>=2.0 # BSD -tempest>=17.1.0 # Apache-2.0 +nose>=1.3.7 # LGPL +setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0,>=16.0 # PSF/ZPL +sphinx!=1.6.6,>=1.6.2 # BSD +flake8<2.6.0,>=2.5.4 # MIT +hacking<0.12,>=0.11.0 # Apache-2.0 +testtools>=2.2.0 # MIT +mock>=2.0.0 # BSD +tempest>=17.1.0 # Apache-2.0