From 11db9c1de6ece0399d784995a4c7a524fc59fc3b Mon Sep 17 00:00:00 2001 From: Ilya Shakhat Date: Tue, 4 Aug 2015 13:27:07 +0300 Subject: [PATCH] Update from global-requirements 1. python-memcached is now Py3 compatible, the separate reqs file is not needed 2. update tox.ini from latest cookiecutter 3. re-generated docs for cli Change-Id: Id0d394f12618bc5ec7860a57043641efcdc6715f --- doc/source/tools/stackalytics-dashboard.txt | 18 ++++++++--------- doc/source/tools/stackalytics-dump.txt | 15 +++++++------- doc/source/tools/stackalytics-processor.txt | 15 +++++++------- etc/stackalytics.conf | 22 ++++++++++----------- requirements-py3.txt | 20 ------------------- requirements.txt | 18 ++++++++--------- setup.cfg | 4 +++- setup.py | 12 +++++++++-- test-requirements.txt | 16 +++++++-------- tox.ini | 22 +++++++-------------- 10 files changed, 70 insertions(+), 92 deletions(-) delete mode 100644 requirements-py3.txt diff --git a/doc/source/tools/stackalytics-dashboard.txt b/doc/source/tools/stackalytics-dashboard.txt index a9fb566ff..aee5f950f 100644 --- a/doc/source/tools/stackalytics-dashboard.txt +++ b/doc/source/tools/stackalytics-dashboard.txt @@ -2,11 +2,12 @@ usage: stackalytics-dashboard [-h] [--config-dir DIR] [--config-file PATH] [--debug] [--log-config-append PATH] [--log-date-format DATE_FORMAT] [--log-dir LOG_DIR] [--log-file PATH] - [--log-format FORMAT] [--nouse-syslog] - [--nouse-syslog-rfc-format] [--noverbose] + [--log-format FORMAT] [--nodebug] + [--nouse-syslog] [--nouse-syslog-rfc-format] + [--noverbose] [--syslog-log-facility SYSLOG_LOG_FACILITY] [--use-syslog] [--use-syslog-rfc-format] - [--verbose] [--version] [--nodebug] + [--verbose] [--version] optional arguments: -h, --help show this help message and exit @@ -20,7 +21,7 @@ optional arguments: can be specified, with values in later files taking precedence. The default files used are: None. --debug, -d Print debugging output (set logging level to DEBUG - instead of default WARNING level). + instead of default INFO level). --log-config-append PATH, --log_config PATH The name of a logging configuration file. This file is appended to any existing logging configuration files. @@ -40,6 +41,7 @@ optional arguments: logging.LogRecord attributes. This option is deprecated. Please use logging_context_format_string and logging_default_format_string instead. + --nodebug The inverse of --debug --nouse-syslog The inverse of --use-syslog --nouse-syslog-rfc-format The inverse of --use-syslog-rfc-format @@ -47,15 +49,13 @@ optional arguments: --syslog-log-facility SYSLOG_LOG_FACILITY Syslog facility to receive log lines. --use-syslog Use syslog for logging. Existing syslog format is - DEPRECATED during I, and changed in J to honor - RFC5424. + DEPRECATED and will be changed later to honor RFC5424. --use-syslog-rfc-format (Optional) Enables or disables syslog rfc5424 format for logging. If enabled, prefixes the MSG part of the syslog message with APP-NAME (RFC5424). The format without the APP-NAME is deprecated in K, and will be removed in M, along with this option. - --verbose, -v Print more verbose output (set logging level to INFO - instead of default WARNING level). + --verbose, -v If set to false, will disable INFO logging level, + making WARNING the default. --version show program's version number and exit - --nodebug The inverse of --debug diff --git a/doc/source/tools/stackalytics-dump.txt b/doc/source/tools/stackalytics-dump.txt index 6cc082ab2..ea7c54c28 100644 --- a/doc/source/tools/stackalytics-dump.txt +++ b/doc/source/tools/stackalytics-dump.txt @@ -5,10 +5,10 @@ usage: stackalytics-dump [-h] [--config-dir DIR] [--config-file PATH] [--min-compress-len MIN_COMPRESS_LEN] [--nodebug] [--norestore] [--nouse-syslog] [--nouse-syslog-rfc-format] [--noverbose] [--restore] + [--runtime-storage-uri RUNTIME_STORAGE_URI] [--syslog-log-facility SYSLOG_LOG_FACILITY] [--use-syslog] [--use-syslog-rfc-format] [--verbose] [--version] - [--runtime-storage-uri RUNTIME_STORAGE_URI] optional arguments: -h, --help show this help message and exit @@ -22,7 +22,7 @@ optional arguments: can be specified, with values in later files taking precedence. The default files used are: None. --debug, -d Print debugging output (set logging level to DEBUG - instead of default WARNING level). + instead of default INFO level). --file FILE, -f FILE The name of file to store data --log-config-append PATH, --log_config PATH The name of a logging configuration file. This file is @@ -52,19 +52,18 @@ optional arguments: The inverse of --use-syslog-rfc-format --noverbose The inverse of --verbose --restore, -r Restore data into memcached + --runtime-storage-uri RUNTIME_STORAGE_URI + Storage URI --syslog-log-facility SYSLOG_LOG_FACILITY Syslog facility to receive log lines. --use-syslog Use syslog for logging. Existing syslog format is - DEPRECATED during I, and changed in J to honor - RFC5424. + DEPRECATED and will be changed later to honor RFC5424. --use-syslog-rfc-format (Optional) Enables or disables syslog rfc5424 format for logging. If enabled, prefixes the MSG part of the syslog message with APP-NAME (RFC5424). The format without the APP-NAME is deprecated in K, and will be removed in M, along with this option. - --verbose, -v Print more verbose output (set logging level to INFO - instead of default WARNING level). + --verbose, -v If set to false, will disable INFO logging level, + making WARNING the default. --version show program's version number and exit - --runtime-storage-uri RUNTIME_STORAGE_URI - Storage URI diff --git a/doc/source/tools/stackalytics-processor.txt b/doc/source/tools/stackalytics-processor.txt index e589bee88..0155584ce 100644 --- a/doc/source/tools/stackalytics-processor.txt +++ b/doc/source/tools/stackalytics-processor.txt @@ -13,13 +13,13 @@ usage: stackalytics-processor [-h] [--config-dir DIR] [--config-file PATH] [--nouse-syslog-rfc-format] [--noverbose] [--project-list-uri PROJECT_LIST_URI] [--review-uri REVIEW_URI] + [--runtime-storage-uri RUNTIME_STORAGE_URI] [--sources-root SOURCES_ROOT] [--ssh-key-filename SSH_KEY_FILENAME] [--ssh-username SSH_USERNAME] [--syslog-log-facility SYSLOG_LOG_FACILITY] [--use-syslog] [--use-syslog-rfc-format] [--verbose] [--version] - [--runtime-storage-uri RUNTIME_STORAGE_URI] optional arguments: -h, --help show this help message and exit @@ -37,7 +37,7 @@ optional arguments: --days_to_update_members DAYS_TO_UPDATE_MEMBERS Number of days to update members --debug, -d Print debugging output (set logging level to DEBUG - instead of default WARNING level). + instead of default INFO level). --default-data-uri DEFAULT_DATA_URI URI for default data --driverlog-data-uri DRIVERLOG_DATA_URI @@ -74,6 +74,8 @@ optional arguments: The address of file with the official projects list --review-uri REVIEW_URI URI of review system + --runtime-storage-uri RUNTIME_STORAGE_URI + Storage URI --sources-root SOURCES_ROOT The folder that holds all project sources to analyze --ssh-key-filename SSH_KEY_FILENAME @@ -83,16 +85,13 @@ optional arguments: --syslog-log-facility SYSLOG_LOG_FACILITY Syslog facility to receive log lines. --use-syslog Use syslog for logging. Existing syslog format is - DEPRECATED during I, and changed in J to honor - RFC5424. + DEPRECATED and will be changed later to honor RFC5424. --use-syslog-rfc-format (Optional) Enables or disables syslog rfc5424 format for logging. If enabled, prefixes the MSG part of the syslog message with APP-NAME (RFC5424). The format without the APP-NAME is deprecated in K, and will be removed in M, along with this option. - --verbose, -v Print more verbose output (set logging level to INFO - instead of default WARNING level). + --verbose, -v If set to false, will disable INFO logging level, + making WARNING the default. --version show program's version number and exit - --runtime-storage-uri RUNTIME_STORAGE_URI - Storage URI diff --git a/etc/stackalytics.conf b/etc/stackalytics.conf index e74be5197..572203f95 100644 --- a/etc/stackalytics.conf +++ b/etc/stackalytics.conf @@ -4,13 +4,15 @@ # From oslo_log # -# Print debugging output (set logging level to DEBUG instead of default WARNING +# Print debugging output (set logging level to DEBUG instead of default INFO # level). (boolean value) #debug = false -# Print more verbose output (set logging level to INFO instead of default -# WARNING level). (boolean value) -#verbose = false +# If set to false, will disable INFO logging level, making WARNING the default. +# (boolean value) +# This option is deprecated for removal. +# Its value may be silently ignored in the future. +#verbose = true # The name of a logging configuration file. This file is appended to any # existing logging configuration files. For details about logging configuration @@ -38,8 +40,8 @@ # Deprecated group/name - [DEFAULT]/logdir #log_dir = -# Use syslog for logging. Existing syslog format is DEPRECATED during I, and -# changed in J to honor RFC5424. (boolean value) +# Use syslog for logging. Existing syslog format is DEPRECATED and will be +# changed later to honor RFC5424. (boolean value) #use_syslog = false # (Optional) Enables or disables syslog rfc5424 format for logging. If enabled, @@ -69,14 +71,11 @@ #logging_exception_prefix = %(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s # List of logger=LEVEL pairs. (list value) -#default_log_levels = amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,urllib3.connectionpool=WARN,websocket=WARN,requests.packages.urllib3.util.retry=WARN,urllib3.util.retry=WARN,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN +#default_log_levels = amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,urllib3.connectionpool=WARN,websocket=WARN,requests.packages.urllib3.util.retry=WARN,urllib3.util.retry=WARN,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN,taskflow=WARN # Enables or disables publication of error events. (boolean value) #publish_errors = false -# Enables or disables fatal status of deprecations. (boolean value) -#fatal_deprecations = false - # The format for an instance that is passed with the log message. (string # value) #instance_format = "[instance: %(uuid)s] " @@ -147,8 +146,7 @@ # seconds (integer value) #dashboard_update_interval = 3600 -# Name of file to store python profiler data. This option works for dashboard -# only (string value) +# Name of file to store python profiler data (string value) #collect_profiler_stats = # Warn if the age of data is more than this value, sec (integer value) diff --git a/requirements-py3.txt b/requirements-py3.txt deleted file mode 100644 index 86fc103ea..000000000 --- a/requirements-py3.txt +++ /dev/null @@ -1,20 +0,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. - -pbr>=0.6,!=0.7,<1.0 -Babel>=1.3 -Flask>=0.10,<1.0 -iso8601>=0.1.9 -oslo.config>=1.6.0 # Apache-2.0 -oslo.i18n>=1.3.0 # Apache-2.0 -oslo.log>=0.4.0 # Apache-2.0 -oslo.serialization>=1.2.0 # Apache-2.0 -oslo.utils>=1.2.0 # Apache-2.0 -paramiko>=1.13.0 -psutil>=1.1.1,<2.0.0 -PyGithub -python3-memcached>=1.48 -PyYAML>=3.1.0 -sh -six>=1.9.0 diff --git a/requirements.txt b/requirements.txt index ee426546a..e84333990 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,19 +2,19 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr>=0.6,!=0.7,<1.0 +pbr<2.0,>=1.3 Babel>=1.3 -Flask>=0.10,<1.0 +Flask<1.0,>=0.10 iso8601>=0.1.9 -oslo.config>=1.6.0 # Apache-2.0 -oslo.i18n>=1.3.0 # Apache-2.0 -oslo.log>=0.4.0 # Apache-2.0 -oslo.serialization>=1.2.0 # Apache-2.0 -oslo.utils>=1.2.0 # Apache-2.0 +oslo.config>=1.11.0 # Apache-2.0 +oslo.i18n>=1.5.0 # Apache-2.0 +oslo.log>=1.8.0 # Apache-2.0 +oslo.serialization>=1.4.0 # Apache-2.0 +oslo.utils>=1.9.0 # Apache-2.0 paramiko>=1.13.0 -psutil>=1.1.1,<2.0.0 +psutil<2.0.0,>=1.1.1 PyGithub -python-memcached>=1.48 +python-memcached>=1.56 PyYAML>=3.1.0 sh six>=1.9.0 diff --git a/setup.cfg b/setup.cfg index 69f4500a3..9138fc221 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = stackalytics -summary = OpenStack analytics dashboard +summary = OpenStack Contribution Dashboard description-file = README.rst author = OpenStack @@ -15,6 +15,8 @@ classifier = Programming Language :: Python Programming Language :: Python :: 2 Programming Language :: Python :: 2.7 + Programming Language :: Python :: 3 + Programming Language :: Python :: 3.4 [files] packages = diff --git a/setup.py b/setup.py index c0a24eab2..d8080d05c 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"); @@ -14,8 +13,17 @@ # 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>=1.3'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 042635df7..1339dd9c6 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,14 +3,14 @@ # process, which may cause wedges in the gate later. # Hacking already pins down pep8, pyflakes and flake8 -hacking>=0.9.4,<0.10 +hacking>=0.10.0,<0.11 coverage>=3.6 discover -fixtures>=0.3.14 -jsonschema>=2.0.0,<3.0.0 -mock>=1.0 -python-subunit -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 +fixtures>=1.3.1 +jsonschema!=2.5.0,<3.0.0,>=2.0.0 +mock>=1.2 +python-subunit>=0.0.18 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 sphinxcontrib-httpdomain -testrepository>=0.0.17 -testtools>=0.9.32,<0.9.35 +testrepository>=0.0.18 +testtools>=1.4.0 diff --git a/tox.ini b/tox.ini index 42a2a18e5..503947b2f 100644 --- a/tox.ini +++ b/tox.ini @@ -1,27 +1,18 @@ [tox] -envlist = py34,py27,pep8 +envlist = py34,py27,pep8,docs minversion = 1.6 skipsdist = True [testenv] usedevelop = True install_command = pip install -U {opts} {packages} -setenv = VIRTUAL_ENV={envdir} - LANG=en_US.UTF-8 - LANGUAGE=en_US:en - LC_ALL=C -deps = -r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements.txt -commands = python setup.py testr --testr-args='{posargs}' -distribute = false - -[testenv:py34] -deps = -r{toxinidir}/requirements-py3.txt - -r{toxinidir}/test-requirements.txt +setenv = + VIRTUAL_ENV={envdir} +deps = -r{toxinidir}/test-requirements.txt +commands = python setup.py test --slowest --testr-args='{posargs}' [testenv:pep8] commands = flake8 -distribute = false [testenv:venv] commands = {posargs} @@ -41,8 +32,9 @@ downloadcache = ~/cache/pip commands = python setup.py build_sphinx [flake8] +# E123, E125 skipped as they are invalid PEP-8 # H904 Wrap long lines in parentheses instead of a backslash -ignore = H904 +ignore = E123,E125,H904 show-source = true builtins = _ exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools,build