diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..f8336f11 --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +swift>=1.8 diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 00000000..8079a97e --- /dev/null +++ b/setup.cfg @@ -0,0 +1,32 @@ +[metadata] +name = swift3 +version = 1.7.0 +summary = Swift AmazonS3 API emulation Middleware +description-file = + README.md +author = OpenStack Foundation +author-email = openstack-dev@lists.openstack.org +home-page = https://github.com/stackforge/swift3 +classifier = + Development Status :: 5 - Production/Stable + 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.6 + Programming Language :: Python :: 2.7 + +[pbr] +skip_authors = True +skip_changelog = True + +[files] +packages = + swift3 + +[entry_points] +paste.filter_factory = + swift3 = swift3.middleware:filter_factory diff --git a/setup.py b/setup.py index 982c24ba..9e7ca15f 100644 --- a/setup.py +++ b/setup.py @@ -9,22 +9,13 @@ # # 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 +import setuptools -import swift3 - - -setup(name='swift3', - version=swift3.version, - description='Swift AmazonS3 API emulation Middleware', - author='OpenStack Foundation', - author_email='openstack-dev@lists.openstack.org', - url='https://github.com/stackforge/swift3', - packages=['swift3'], - requires=['swift(>=1.4)'], - entry_points={'paste.filter_factory': - ['swift3=swift3.middleware:filter_factory']}) +setuptools.setup( + setup_requires=['pbr'], + pbr=True) diff --git a/swift3/__init__.py b/swift3/__init__.py index 50491021..6e56b37c 100644 --- a/swift3/__init__.py +++ b/swift3/__init__.py @@ -15,10 +15,17 @@ """ Static Web Middleware for OpenStack Swift """ +import pbr.version __all__ = ['version_info', 'version'] -#: Version information ``(major, minor, revision)``. -version_info = (1, 7, 0) +# get version info using pbr.version. +# pbr version info is inferred from version in setup.cfg +# and vcs information. +_version_info = pbr.version.VersionInfo('swift3') + #: Version string ``'major.minor.revision'``. -version = '.'.join(map(str, version_info)) +version = _version_info.version_string() + +#: Version information ``(major, minor, revision)``. +version_info = version.split('.')