From 6e79f574bb1d48acff0f68dfaede0f6648360e75 Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Fri, 13 May 2016 13:14:56 -0700 Subject: [PATCH] Fix a bunch of files that are not needed/incorrect --- HACKING.rst | 4 ++-- README.rst | 13 +++---------- babel.cfg | 2 -- doc/source/index.rst | 8 ++++---- openstack-common.conf | 8 -------- requirements.txt | 2 +- setup.cfg | 22 ++++------------------ 7 files changed, 14 insertions(+), 45 deletions(-) delete mode 100644 babel.cfg delete mode 100644 openstack-common.conf diff --git a/HACKING.rst b/HACKING.rst index cbd5bab..71f36fb 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -1,4 +1,4 @@ -oslo.delimiter Style Commandments -====================================================== +Delimiter Style Commandments +============================ Read the OpenStack Style Commandments http://docs.openstack.org/developer/hacking/ diff --git a/README.rst b/README.rst index 5a5428c..d517199 100644 --- a/README.rst +++ b/README.rst @@ -1,14 +1,7 @@ -=================================== -delimiter -=================================== +========= +Delimiter +========= OpenStack Cross Project Quota Enforcement and Management Library -Please feel here a long description which must be at least 3 lines wrapped on -80 cols, so that distribution package maintainers can use it in their packages. -Note that this is a hard requirement. - * Free software: Apache license -* Documentation: http://docs.openstack.org/developer/oslo.delimiter -* Source: http://git.openstack.org/cgit/openstack/oslo.delimiter -* Bugs: http://bugs.launchpad.net/oslo.delimiter diff --git a/babel.cfg b/babel.cfg deleted file mode 100644 index 15cd6cb..0000000 --- a/babel.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[python: **.py] - diff --git a/doc/source/index.rst b/doc/source/index.rst index cbfe7c1..23e4669 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -1,8 +1,8 @@ -================ - oslo.delimiter -================ +=========== + Delimiter +=========== -CrOpenStack Cross Project Quota Enforcement and Management Library +OpenStack Cross Project Quota Enforcement and Management Library Contents ======== diff --git a/openstack-common.conf b/openstack-common.conf deleted file mode 100644 index 93a14c4..0000000 --- a/openstack-common.conf +++ /dev/null @@ -1,8 +0,0 @@ -[DEFAULT] -# The list of scripts and modules to copy from oslo-incubator -# For example: -# script=tools/with_venv.sh -# module=service - -# The base module to hold the copy of openstack.common -base=oslo_delimiter diff --git a/requirements.txt b/requirements.txt index c299e3b..95d0fe8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,4 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -Babel>=1.3 +pbr>=1.6 # Apache-2.0 diff --git a/setup.cfg b/setup.cfg index f4b8db0..3be9ce1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,11 +1,11 @@ [metadata] -name = oslo.delimiter -summary = CrOpenStack Cross Project Quota Enforcement and Management Library +name = delimiter +summary = OpenStack Cross Project Quota Enforcement and Management Library description-file = README.rst author = OpenStack author-email = openstack-dev@lists.openstack.org -home-page = http://launchpad.net/oslo +home-page = http://launchpad.net/delimiter classifier = Environment :: OpenStack Intended Audience :: Information Technology @@ -21,7 +21,7 @@ classifier = [files] packages = - oslo_delimiter + delimiter [pbr] warnerrors = true @@ -34,19 +34,5 @@ all_files = 1 [upload_sphinx] upload-dir = doc/build/html -[compile_catalog] -directory = oslo.delimiter/locale -domain = oslo.delimiter - -[update_catalog] -domain = oslo.delimiter -output_dir = oslo.delimiter/locale -input_file = oslo.delimiter/locale/oslo.delimiter.pot - -[extract_messages] -keywords = _ gettext ngettext l_ lazy_gettext -mapping_file = babel.cfg -output_file = oslo.delimiter/locale/oslo.delimiter.pot - [wheel] universal = true