diff --git a/.coveragerc b/.coveragerc new file mode 100644 index 00000000..36c6fa01 --- /dev/null +++ b/.coveragerc @@ -0,0 +1,7 @@ +[run] +branch = True +source = service +omit = service/tests/*,service/openstack/* + +[report] +ignore-errors = True diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..dfe851d0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,51 @@ +*.py[cod] + +# C extensions +*.so + +# Packages +*.egg +*.egg-info +dist +build +eggs +parts +bin +var +sdist +develop-eggs +.installed.cfg +lib +lib64 + +# Installer logs +pip-log.txt + +# Unit test / coverage reports +.coverage +.tox +nosetests.xml +.testrepository + +# Translations +*.mo + +# Mr Developer +.mr.developer.cfg +.project +.pydevproject + +# Complexity +output/*.html +output/*/index.html + +# Sphinx +doc/build + +# pbr generates these +AUTHORS +ChangeLog + +# Editors +*~ +.*.swp diff --git a/.gitreview b/.gitreview new file mode 100644 index 00000000..1cc7c692 --- /dev/null +++ b/.gitreview @@ -0,0 +1,4 @@ +[gerrit] +host=review.openstack.org +port=29418 +project=openstack/oslo.service.git diff --git a/.mailmap b/.mailmap new file mode 100644 index 00000000..516ae6fe --- /dev/null +++ b/.mailmap @@ -0,0 +1,3 @@ +# Format is: +# +# diff --git a/.testr.conf b/.testr.conf new file mode 100644 index 00000000..b967b709 --- /dev/null +++ b/.testr.conf @@ -0,0 +1,7 @@ +[DEFAULT] +test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \ + OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \ + OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \ + ${PYTHON:-python} -m subunit.run discover -t ./ ./oslo_service $LISTOPT $IDOPTION +test_id_option=--load-list $IDFILE +test_list_option=--list diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst new file mode 100644 index 00000000..617ba44c --- /dev/null +++ b/CONTRIBUTING.rst @@ -0,0 +1,16 @@ +If you would like to contribute to the development of OpenStack, +you must follow the steps in this page: + + http://docs.openstack.org/infra/manual/developers.html + +Once those steps have been completed, changes to OpenStack +should be submitted for review via the Gerrit tool, following +the workflow documented at: + + http://docs.openstack.org/infra/manual/developers.html#development-workflow + +Pull requests submitted through GitHub will be ignored. + +Bugs should be filed on Launchpad, not GitHub: + + https://bugs.launchpad.net/oslo.service diff --git a/HACKING.rst b/HACKING.rst new file mode 100644 index 00000000..b8bde51a --- /dev/null +++ b/HACKING.rst @@ -0,0 +1,4 @@ +oslo.service Style Commandments +====================================================== + +Read the OpenStack Style Commandments http://docs.openstack.org/developer/hacking/ diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..68c771a0 --- /dev/null +++ b/LICENSE @@ -0,0 +1,176 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 00000000..c978a52d --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,6 @@ +include AUTHORS +include ChangeLog +exclude .gitignore +exclude .gitreview + +global-exclude *.pyc diff --git a/README.rst b/README.rst new file mode 100644 index 00000000..7e14f697 --- /dev/null +++ b/README.rst @@ -0,0 +1,10 @@ +=================================== +oslo.service +=================================== + +oslo.service library + +* Free software: Apache license +* Documentation: http://docs.openstack.org/developer/oslo.service +* Source: http://git.openstack.org/cgit/openstack/oslo.service +* Bugs: http://bugs.launchpad.net/oslo.service diff --git a/babel.cfg b/babel.cfg new file mode 100644 index 00000000..15cd6cb7 --- /dev/null +++ b/babel.cfg @@ -0,0 +1,2 @@ +[python: **.py] + diff --git a/doc/source/api.rst b/doc/source/api.rst new file mode 100644 index 00000000..971225e7 --- /dev/null +++ b/doc/source/api.rst @@ -0,0 +1,12 @@ +===== + API +===== + +.. Use autodoc directives to describe the *public* modules and classes + in the library. + + If the modules are completely unrelated, create an api subdirectory + and use a separate file for each (see oslo.utils). + + If there is only one submodule, a single api.rst file like this + sufficient (see oslo.i18n). diff --git a/doc/source/conf.py b/doc/source/conf.py new file mode 100755 index 00000000..848d1bb0 --- /dev/null +++ b/doc/source/conf.py @@ -0,0 +1,75 @@ +# -*- coding: utf-8 -*- +# 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 +# +# 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. +# See the License for the specific language governing permissions and +# limitations under the License. + +import os +import sys + +sys.path.insert(0, os.path.abspath('../..')) +# -- General configuration ---------------------------------------------------- + +# Add any Sphinx extension module names here, as strings. They can be +# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones. +extensions = [ + 'sphinx.ext.autodoc', + #'sphinx.ext.intersphinx', + 'oslosphinx' +] + +# autodoc generation is a bit aggressive and a nuisance when doing heavy +# text edit cycles. +# execute "export SPHINX_DEBUG=1" in your terminal to disable + +# The suffix of source filenames. +source_suffix = '.rst' + +# The master toctree document. +master_doc = 'index' + +# General information about the project. +project = u'oslo.service' +copyright = u'2014, OpenStack Foundation' + +# If true, '()' will be appended to :func: etc. cross-reference text. +add_function_parentheses = True + +# If true, the current module name will be prepended to all description +# unit titles (such as .. function::). +add_module_names = True + +# The name of the Pygments (syntax highlighting) style to use. +pygments_style = 'sphinx' + +# -- Options for HTML output -------------------------------------------------- + +# The theme to use for HTML and HTML Help pages. Major themes that come with +# Sphinx are currently 'default' and 'sphinxdoc'. +# html_theme_path = ["."] +# html_theme = '_theme' +# html_static_path = ['static'] + +# Output file base name for HTML help builder. +htmlhelp_basename = '%sdoc' % project + +# Grouping the document tree into LaTeX files. List of tuples +# (source start file, target name, title, author, documentclass +# [howto/manual]). +latex_documents = [ + ('index', + '%s.tex' % project, + u'%s Documentation' % project, + u'OpenStack Foundation', 'manual'), +] + +# Example configuration for intersphinx: refer to the Python standard library. +#intersphinx_mapping = {'http://docs.python.org/': None} diff --git a/doc/source/contributing.rst b/doc/source/contributing.rst new file mode 100644 index 00000000..2ca75d1b --- /dev/null +++ b/doc/source/contributing.rst @@ -0,0 +1,5 @@ +============== + Contributing +============== + +.. include:: ../../CONTRIBUTING.rst diff --git a/doc/source/history.rst b/doc/source/history.rst new file mode 100644 index 00000000..69ed4fe6 --- /dev/null +++ b/doc/source/history.rst @@ -0,0 +1 @@ +.. include:: ../../ChangeLog diff --git a/doc/source/index.rst b/doc/source/index.rst new file mode 100644 index 00000000..468ffe02 --- /dev/null +++ b/doc/source/index.rst @@ -0,0 +1,25 @@ +============== + oslo.service +============== + +oslo.service library + +Contents +======== + +.. toctree:: + :maxdepth: 2 + + installation + api + usage + contributing + history + +Indices and tables +================== + +* :ref:`genindex` +* :ref:`modindex` +* :ref:`search` + diff --git a/doc/source/installation.rst b/doc/source/installation.rst new file mode 100644 index 00000000..6e94caa0 --- /dev/null +++ b/doc/source/installation.rst @@ -0,0 +1,7 @@ +============== + Installation +============== + +At the command line:: + + $ pip install oslo.service diff --git a/doc/source/usage.rst b/doc/source/usage.rst new file mode 100644 index 00000000..a8808085 --- /dev/null +++ b/doc/source/usage.rst @@ -0,0 +1,7 @@ +======= + Usage +======= + +To use oslo.service in a project:: + + import oslo_service diff --git a/openstack-common.conf b/openstack-common.conf new file mode 100644 index 00000000..85b3d7f2 --- /dev/null +++ b/openstack-common.conf @@ -0,0 +1,7 @@ +[DEFAULT] + +# The list of modules to copy from oslo-incubator.git +script = + +# The base module to hold the copy of openstack.common +base=oslo_service diff --git a/oslo_service/__init__.py b/oslo_service/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/openstack/common/eventlet_backdoor.py b/oslo_service/eventlet_backdoor.py similarity index 100% rename from openstack/common/eventlet_backdoor.py rename to oslo_service/eventlet_backdoor.py diff --git a/openstack/common/loopingcall.py b/oslo_service/loopingcall.py similarity index 100% rename from openstack/common/loopingcall.py rename to oslo_service/loopingcall.py diff --git a/openstack/common/periodic_task.py b/oslo_service/periodic_task.py similarity index 100% rename from openstack/common/periodic_task.py rename to oslo_service/periodic_task.py diff --git a/openstack/common/service.py b/oslo_service/service.py similarity index 100% rename from openstack/common/service.py rename to oslo_service/service.py diff --git a/openstack/common/sslutils.py b/oslo_service/sslutils.py similarity index 100% rename from openstack/common/sslutils.py rename to oslo_service/sslutils.py diff --git a/openstack/common/systemd.py b/oslo_service/systemd.py similarity index 100% rename from openstack/common/systemd.py rename to oslo_service/systemd.py diff --git a/oslo_service/tests/__init__.py b/oslo_service/tests/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/unit/eventlet_service.py b/oslo_service/tests/eventlet_service.py similarity index 99% rename from tests/unit/eventlet_service.py rename to oslo_service/tests/eventlet_service.py index 62e63241..074c0480 100644 --- a/tests/unit/eventlet_service.py +++ b/oslo_service/tests/eventlet_service.py @@ -110,7 +110,7 @@ class Server(object): The service interface is used by the launcher when receiving a SIGHUP. The service interface is defined in - openstack.common.service.Service. + oslo_service.Service. Test server does not need to do anything here. """ diff --git a/tests/unit/test_eventlet_backdoor.py b/oslo_service/tests/test_eventlet_backdoor.py similarity index 100% rename from tests/unit/test_eventlet_backdoor.py rename to oslo_service/tests/test_eventlet_backdoor.py diff --git a/tests/unit/test_loopingcall.py b/oslo_service/tests/test_loopingcall.py similarity index 100% rename from tests/unit/test_loopingcall.py rename to oslo_service/tests/test_loopingcall.py diff --git a/tests/unit/test_periodic.py b/oslo_service/tests/test_periodic.py similarity index 100% rename from tests/unit/test_periodic.py rename to oslo_service/tests/test_periodic.py diff --git a/tests/unit/test_service.py b/oslo_service/tests/test_service.py similarity index 96% rename from tests/unit/test_service.py rename to oslo_service/tests/test_service.py index f0fb5753..9e3f7d9e 100644 --- a/tests/unit/test_service.py +++ b/oslo_service/tests/test_service.py @@ -355,7 +355,7 @@ class LauncherTest(test_base.BaseTestCase): # unit test fixtures in nova bug #1199315) launcher.stop() - @mock.patch('openstack.common.service.ServiceLauncher.launch_service') + @mock.patch('oslo_service.ServiceLauncher.launch_service') def _test_launch_single(self, workers, mock_launch): svc = service.Service() service.launch(svc, workers=workers) @@ -367,7 +367,7 @@ class LauncherTest(test_base.BaseTestCase): def test_launch_one_worker(self): self._test_launch_single(1) - @mock.patch('openstack.common.service.ProcessLauncher.launch_service') + @mock.patch('oslo_service.ProcessLauncher.launch_service') def test_multiple_worker(self, mock_launch): svc = service.Service() service.launch(svc, workers=3) @@ -383,7 +383,7 @@ class ProcessLauncherTest(test_base.BaseTestCase): self.assertTrue(launcher.running) launcher.children = [22, 222] - with mock.patch('openstack.common.service.os.kill') as mock_kill: + with mock.patch('oslo_service.os.kill') as mock_kill: with mock.patch.object(launcher, '_wait_child') as _wait_child: _wait_child.side_effect = lambda: launcher.children.pop() launcher.stop() @@ -395,7 +395,7 @@ class ProcessLauncherTest(test_base.BaseTestCase): mock_kill.mock_calls) @mock.patch( - "openstack.common.service.ProcessLauncher._signal_handlers_set", + "oslo_service.ProcessLauncher._signal_handlers_set", new_callable=lambda: set()) def test__signal_handlers_set(self, signal_handlers_set_mock): callables = set() @@ -409,7 +409,7 @@ class ProcessLauncherTest(test_base.BaseTestCase): service.ProcessLauncher._signal_handlers_set) @mock.patch( - "openstack.common.service.ProcessLauncher._signal_handlers_set", + "oslo_service.ProcessLauncher._signal_handlers_set", new_callable=lambda: set()) def test__handle_class_signals(self, signal_handlers_set_mock): signal_handlers_set_mock.update([mock.Mock(), mock.Mock()]) @@ -418,13 +418,13 @@ class ProcessLauncherTest(test_base.BaseTestCase): m.assert_called_once_with() @mock.patch("os.kill") - @mock.patch("openstack.common.service.ProcessLauncher.stop") - @mock.patch("openstack.common.service.ProcessLauncher._respawn_children") - @mock.patch("openstack.common.service.ProcessLauncher.handle_signal") + @mock.patch("oslo_service.ProcessLauncher.stop") + @mock.patch("oslo_service.ProcessLauncher._respawn_children") + @mock.patch("oslo_service.ProcessLauncher.handle_signal") @mock.patch("oslo_config.cfg.CONF.log_opt_values") @mock.patch("openstack.common.systemd.notify_once") @mock.patch("oslo_config.cfg.CONF.reload_config_files") - @mock.patch("openstack.common.service._is_sighup_and_daemon") + @mock.patch("oslo_service._is_sighup_and_daemon") def test_parent_process_reload_config(self, is_sighup_and_daemon_mock, reload_config_files_mock, diff --git a/tests/unit/test_systemd.py b/oslo_service/tests/test_systemd.py similarity index 100% rename from tests/unit/test_systemd.py rename to oslo_service/tests/test_systemd.py diff --git a/tests/unit/test_threadgroup.py b/oslo_service/tests/test_threadgroup.py similarity index 100% rename from tests/unit/test_threadgroup.py rename to oslo_service/tests/test_threadgroup.py diff --git a/openstack/common/threadgroup.py b/oslo_service/threadgroup.py similarity index 100% rename from openstack/common/threadgroup.py rename to oslo_service/threadgroup.py diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..614c804e --- /dev/null +++ b/requirements.txt @@ -0,0 +1,5 @@ +# 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. + +Babel>=0.9.6 diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 00000000..cf0b1fc1 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,53 @@ +[metadata] +name = oslo.service +summary = oslo.service library +description-file = + README.rst +author = OpenStack +author-email = openstack-dev@lists.openstack.org +home-page = http://launchpad.net/oslo +classifier = + Environment :: OpenStack + Intended Audience :: Information Technology + Intended Audience :: System Administrators + License :: OSI Approved :: Apache Software License + Operating System :: POSIX :: Linux + Programming Language :: Python + Programming Language :: Python :: 2 + Programming Language :: Python :: 2.7 + Programming Language :: Python :: 2.6 + Programming Language :: Python :: 3 + Programming Language :: Python :: 3.3 + Programming Language :: Python :: 3.4 + +[files] +packages = + oslo_service + +[pbr] +warnerrors = true + +[build_sphinx] +source-dir = doc/source +build-dir = doc/build +all_files = 1 + +[upload_sphinx] +upload-dir = doc/build/html + +[compile_catalog] +directory = oslo.service/locale +domain = oslo.service + +[update_catalog] +domain = oslo.service +output_dir = oslo.service/locale +input_file = oslo.service/locale/oslo.service.pot + +[extract_messages] +keywords = _ gettext ngettext l_ lazy_gettext +mapping_file = babel.cfg +output_file = oslo.service/locale/oslo.service.pot + +[wheel] +universal = true diff --git a/setup.py b/setup.py new file mode 100755 index 00000000..73637574 --- /dev/null +++ b/setup.py @@ -0,0 +1,30 @@ +#!/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 +# +# 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. +# 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'], + pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt new file mode 100644 index 00000000..0cc3baf1 --- /dev/null +++ b/test-requirements.txt @@ -0,0 +1,10 @@ +# 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. + +hacking<0.11,>=0.10.0 +oslotest + +# These are needed for docs generation +oslosphinx +sphinx>=1.1.2,!=1.2.0,<1.3 diff --git a/tox.ini b/tox.ini new file mode 100644 index 00000000..2c110c3d --- /dev/null +++ b/tox.ini @@ -0,0 +1,40 @@ +[tox] +minversion = 1.6 +envlist = py34,py26,py27,pypy,pep8 +# NOTE(dhellmann): We cannot set skipdist=True +# for oslo libraries because of the namespace package. +#skipsdist = True + +[testenv] +# NOTE(dhellmann): We cannot set usedevelop=True +# for oslo libraries because of the namespace package. +#usedevelop = True +install_command = pip install -U {opts} {packages} +setenv = + VIRTUAL_ENV={envdir} +deps = -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt +commands = python setup.py testr --slowest --testr-args='{posargs}' + +[testenv:pep8] +commands = flake8 + +[testenv:venv] +commands = {posargs} + +[testenv:docs] +commands = python setup.py build_sphinx + +[testenv:cover] +commands = python setup.py testr --coverage --testr-args='{posargs}' + +[flake8] +# E123, E125 skipped as they are invalid PEP-8. + +show-source = True +ignore = E123,E125 +builtins = _ +exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build + +[hacking] +import_exceptions =