From 11ff7365a3aaddec4e6368e56555948e8a8cca8c Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Thu, 6 Feb 2020 19:36:55 +0100 Subject: [PATCH] Update lower-constraints This repo has not been testing lower-constraints at all due to broken install_command. If you look at any lower-constraints run and compare the install python packages with lower-constraints, you see that those are completely different. This change removes install_command and updates deps in tox.ini to follow best practices (moving constraints into deps). It also updates lower-constraints to newer versions. Remove broken hacking test. Co-Authored-By: Justin Ferrieu Change-Id: I13daab9e53617266beff7053e50779d1f281802c --- doc/source/_static/cloudkitty.conf.sample | 15 ++-- lower-constraints.txt | 99 ++++++++++++----------- requirements.txt | 66 +++++++-------- test-requirements.txt | 30 +++---- tox.ini | 5 +- 5 files changed, 110 insertions(+), 105 deletions(-) diff --git a/doc/source/_static/cloudkitty.conf.sample b/doc/source/_static/cloudkitty.conf.sample index 2ff512e5..5eb27ebe 100644 --- a/doc/source/_static/cloudkitty.conf.sample +++ b/doc/source/_static/cloudkitty.conf.sample @@ -182,6 +182,7 @@ # # Size of RPC connection pool. (integer value) +# Minimum value: 1 #rpc_conn_pool_size = 30 # The pool size limit for connections expiration policy (integer @@ -1131,13 +1132,15 @@ # Deprecated group/name - [oslo_messaging_rabbit]/kombu_ssl_ca_certs #ssl_ca_file = -# EXPERIMENTAL: Run the health check heartbeat thread through a native -# python thread. By default if this option isn't provided the health -# check heartbeat will inherit the execution model from the parent -# process. By example if the parent process have monkey patched the -# stdlib by using eventlet/greenlet then the heartbeat will be run +# DEPRECATED: Run the health check heartbeat thread through a native +# python thread by default. If this option is equal to False then the +# health check heartbeat will inherit the execution model from the +# parent process. For example if the parent process has monkey patched +# the stdlib by using eventlet/greenlet then the heartbeat will be run # through a green thread. (boolean value) -#heartbeat_in_pthread = false +# This option is deprecated for removal. +# Its value may be silently ignored in the future. +#heartbeat_in_pthread = true # How long to wait before reconnecting in response to an AMQP consumer # cancel notification. (floating point value) diff --git a/lower-constraints.txt b/lower-constraints.txt index a10ddeb7..d1dd8146 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -1,52 +1,53 @@ # requirements -pbr==2.0.0 # Apache-2.0 -alembic==0.8.0 # MIT -keystonemiddleware==4.0.0 # Apache-2.0 -gnocchiclient==2.5.0 # Apache-2.0 -python-monascaclient==1.9.0 # Apache-2.0 -python-keystoneclient==1.9.0 # Apache-2.0 -keystoneauth1==2.1.0 # Apache-2.0 -iso8601==0.1.9 # MIT -PasteDeploy==1.5.0 # MIT -pecan==1.0.0 # BSD -WSME==0.8 # MIT -oslo.config==3.7.0 # Apache-2.0 -oslo.context==2.9.0 # Apache-2.0 -oslo.concurrency==3.5.0 # Apache-2.0 -oslo.db==4.1.0 # Apache-2.0 -oslo.i18n==2.1.0 # Apache-2.0 -oslo.log==1.14.0 # Apache-2.0 -oslo.messaging==5.24.2 # Apache-2.0 -oslo.middleware==3.27.0 # Apache-2.0 -oslo.policy==0.5.0 # Apache-2.0 -oslo.utils==3.5.0 # Apache-2.0 -oslo.upgradecheck==0.1.1 # Apache-2.0 -python-dateutil==2.5.3 # BSD -SQLAlchemy==1.0.10 # MIT -six==1.9.0 # MIT -stevedore==1.5.0 # Apache-2.0 -tooz==1.28.0 # Apache-2.0 -voluptuous==0.11.1 # BSD-3 -influxdb==5.1.0 # MIT -Flask==1.0.2 # BSD -Flask-RESTful==0.3.5 # BSD -cotyledon==1.5.0 # Apache-2.0 -futurist==1.6.0 # Apache-2.0 +pbr==5.5.1 # Apache-2.0 +alembic==1.4.3 # MIT +keystonemiddleware==9.1.0 # Apache-2.0 +gnocchiclient==7.0.6 # Apache-2.0 +python-monascaclient==2.2.1 # Apache-2.0 +python-keystoneclient==4.1.1 # Apache-2.0 +keystoneauth1==4.2.1 # Apache-2.0 +iso8601==0.1.13 # MIT +PasteDeploy==2.1.1 # MIT +pecan==1.3.3 # BSD +WSME==0.10.0 # MIT +oslo.config==8.3.3 # Apache-2.0 +oslo.context==3.1.1 # Apache-2.0 +oslo.concurrency==4.3.1 # Apache-2.0 +oslo.db==8.4.0 # Apache-2.0 +oslo.i18n==5.0.1 # Apache-2.0 +oslo.log==4.4.0 # Apache-2.0 +oslo.messaging==12.6.0 # Apache-2.0 +oslo.middleware==4.1.1 # Apache-2.0 +oslo.policy==3.5.0 # Apache-2.0 +oslo.utils==4.7.0 # Apache-2.0 +oslo.upgradecheck==1.2.0 # Apache-2.0 +python-dateutil==2.7.0 # BSD +SQLAlchemy==1.3.20 # MIT +six==1.15.0 # MIT +stevedore==3.2.2 # Apache-2.0 +tooz==2.7.1 # Apache-2.0 +voluptuous==0.12.0 # BSD-3 +influxdb==5.3.1 # MIT +Flask==1.1.2 # BSD +Flask-RESTful==0.3.8 # BSD +cotyledon==1.7.3 # Apache-2.0 +futurist==2.3.0 # Apache-2.0 +bandit>=1.6.0 # Apache-2.0 # test-requirements -coverage==3.6 # Apache-2.0 -kombu==4.0.0 # BSD -ddt==1.0.1 # MIT -gabbi==1.26.1 # Apache-2.0 -testscenarios==0.4 # Apache-2.0/BSD -stestr==2.0.0 # Apache-2.0 -sphinx==2.0.0 # BSD -openstackdocstheme==2.2.1 -oslotest==1.10.0 # Apache-2.0 -sphinxcontrib-pecanwsme==0.8 # Apache-2.0 -reno==3.1.0 -sphinxcontrib-httpdomain==1.6.0 # Apache-2.0 -doc8==0.6.0 # Apache-2.0 -Pygments==2.2.0 # BSD -bandit==1.6.0 # Apache-2.0 -os-api-ref==1.0.0 # Apache-2.0 +coverage==5.3 # Apache-2.0 +kombu==5.0.2 # BSD +ddt==1.4.1 # MIT +gabbi==2.0.4 # Apache-2.0 +testscenarios==0.5.0 # Apache-2.0/BSD +stestr==3.0.1 # Apache-2.0 +sphinx==3.3.1 # BSD +openstackdocstheme==2.2.6 +oslotest==4.4.1 # Apache-2.0 +sphinxcontrib-pecanwsme==0.10.0 # Apache-2.0 +reno==3.2.0 +sphinxcontrib-httpdomain==1.7.0 # Apache-2.0 +doc8==0.8.1 # Apache-2.0 +Pygments==2.7.2 # BSD +os-api-ref==2.1.0 # Apache-2.0 + diff --git a/requirements.txt b/requirements.txt index ca8623a3..2fec85c5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,36 +1,36 @@ # 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.0.0,!=2.1.0 # Apache-2.0 -alembic>=0.8.0 # MIT -keystonemiddleware>=4.0.0 # Apache-2.0 -gnocchiclient>=2.5.0 # Apache-2.0 -python-monascaclient>=1.9.0 # Apache-2.0 -python-keystoneclient>=1.9.0,!=2.1.0 # Apache-2.0 -keystoneauth1>=2.1.0 # Apache-2.0 -iso8601>=0.1.9 # MIT -PasteDeploy>=1.5.0 # MIT -pecan>=1.0.0,!=1.0.2,!=1.0.3,!=1.0.4,!=1.2 # BSD -WSME>=0.8 # MIT -oslo.config>=3.7.0,!=4.3.0,!=4.4.0 # Apache-2.0 -oslo.context>=2.9.0 # Apache-2.0 -oslo.concurrency>=3.5.0 # Apache-2.0 -oslo.db>=4.1.0 # Apache-2.0 -oslo.i18n>=2.1.0 # Apache-2.0 -oslo.log>=1.14.0 # Apache-2.0 -oslo.messaging>=5.24.2,!=9.0.0 # Apache-2.0 -oslo.middleware>=3.27.0 # Apache-2.0 -oslo.policy>=0.5.0 # Apache-2.0 -oslo.utils>=3.5.0 # Apache-2.0 -oslo.upgradecheck>=0.1.1 # Apache-2.0 -python-dateutil>=2.5.3 # BSD -SQLAlchemy>=1.0.10,!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8 # MIT -six>=1.9.0 # MIT -stevedore>=1.5.0 # Apache-2.0 -tooz>=1.28.0 # Apache-2.0 -voluptuous>=0.11.1 # BSD License -influxdb>=5.1.0 # MIT -Flask>=1.0.2 # BSD -Flask-RESTful>=0.3.5 # BSD -cotyledon>=1.5.0 # Apache-2.0 -futurist>=1.6.0 # Apache-2.0 +pbr>=5.5.1 # Apache-2.0 +alembic>=1.4.3 # MIT +keystonemiddleware>=9.1.0 # Apache-2.0 +gnocchiclient>=7.0.6 # Apache-2.0 +python-monascaclient>=2.2.1 # Apache-2.0 +python-keystoneclient>=4.1.1 # Apache-2.0 +keystoneauth1>=4.2.1 # Apache-2.0 +iso8601>=0.1.13 # MIT +PasteDeploy>=2.1.1 # MIT +pecan>=1.3.3 # BSD +WSME>=0.10.0 # MIT +oslo.config>=8.3.3 # Apache-2.0 +oslo.context>=3.1.1 # Apache-2.0 +oslo.concurrency>=4.3.1 # Apache-2.0 +oslo.db>=8.4.0 # Apache-2.0 +oslo.i18n>=5.0.1 # Apache-2.0 +oslo.log>=4.4.0 # Apache-2.0 +oslo.messaging>=12.6.0 # Apache-2.0 +oslo.middleware>=4.1.1 # Apache-2.0 +oslo.policy>=3.5.0 # Apache-2.0 +oslo.utils>=4.7.0 # Apache-2.0 +oslo.upgradecheck>=1.2.0 # Apache-2.0 +python-dateutil>=2.7.0 # BSD +SQLAlchemy>=1.3.20 # MIT +six>=1.15.0 # MIT +stevedore>=3.2.2 # Apache-2.0 +tooz>=2.7.1 # Apache-2.0 +voluptuous>=0.12.0 # BSD License +influxdb>=5.3.1 # MIT +Flask>=1.1.2 # BSD +Flask-RESTful>=0.3.8 # BSD +cotyledon>=1.7.3 # Apache-2.0 +futurist>=2.3.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index e7908789..d1cd498f 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,19 +5,19 @@ # hacking should be first hacking>=3.0.1,<3.1.0 # Apache-2.0 -coverage>=3.6,!=4.4 # Apache-2.0 -kombu>=4.0.0,!=4.0.2 # BSD -ddt>=1.0.1 # MIT -gabbi>=1.26.1 # Apache-2.0 -testscenarios>=0.4 # Apache-2.0/BSD -stestr>=2.0.0 # Apache-2.0 -sphinx>=2.0.0,!=2.1.0 # BSD -openstackdocstheme>=2.2.1 # Apache-2.0 -oslotest>=1.10.0 # Apache-2.0 -sphinxcontrib-httpdomain>=1.6.0 # BSD -sphinxcontrib-pecanwsme>=0.8 # Apache-2.0 -reno>=3.1.0 # Apache-2.0 -doc8>=0.6.0 # Apache-2.0 -Pygments>=2.2.0 # BSD license +coverage>=5.3 # Apache-2.0 +kombu>=5.0.2 # BSD +ddt>=1.4.1 # MIT +gabbi>=2.0.4 # Apache-2.0 +testscenarios>=0.5.0 # Apache-2.0/BSD +stestr>=3.0.1 # Apache-2.0 +sphinx>=3.3.1 # BSD +openstackdocstheme>=2.2.6 # Apache-2.0 +oslotest>=4.4.1 # Apache-2.0 +sphinxcontrib-httpdomain>=1.7.0 # BSD +sphinxcontrib-pecanwsme>=0.10.0 # Apache-2.0 +reno>=3.2.0 # Apache-2.0 +doc8>=0.8.1 # Apache-2.0 +Pygments>=2.7.2 # BSD license +os-api-ref>=2.1.0 # Apache-2.0 bandit>=1.6.0 # Apache-2.0 -os-api-ref>=1.0.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index de8d07d0..07678c56 100644 --- a/tox.ini +++ b/tox.ini @@ -10,10 +10,11 @@ whitelist_externals = rm setenv = VIRTUAL_ENV={envdir} PYTHONWARNINGS=default::DeprecationWarning usedevelop = True -install_command = pip install -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages} -deps = -r{toxinidir}/requirements.txt +deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt + commands = /usr/bin/find . -type f -name "*.py[co]" -delete rm -f .testrepository/times.dbm