From 79886df354f363ed448bdfbb44e2a4f6af4e1774 Mon Sep 17 00:00:00 2001
From: Tony Breeds <tony@bakeyournoodle.com>
Date: Thu, 2 May 2019 11:37:15 -0600
Subject: [PATCH] Change the dist name to 'storyboard-api'

In order to be able to upload to PyPI we need to avoid the name
clash with another existing "storyboard" project which is still
active there, in use and is understandably disinclined consider
renaming (they were there first). We can eventually consider
renaming our project fully to storyboard-api along with its Git
repository and all, but for now simply publishing under an
alternative distribution name will suffice.

While we're in there, add some additional Python package metadata,
correct some more, and remove an invalid trove classifier which
would have prevented uploading. Also mark the resulting wheel as
"universal" (supporting both Python 2 and 3). Bump the minimum PBR
version to accommodate the project_urls and description-content-type
options.

Change-Id: I365ad340ec875f8603e088fa114e7de8aff191c9
---
 requirements.txt       |  4 ++--
 setup.cfg              | 24 +++++++++++++++++-------
 setup.py               |  2 +-
 storyboard/__init__.py |  3 +--
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 101c09b9..5e126034 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-pbr>=1.6
+pbr>=5
 jsonschema>=2.0.0,<3.0.0
 alembic>=0.4.1
 Babel>=1.3
@@ -29,4 +29,4 @@ apscheduler>=3.0.1,<3.1.0
 python_dateutil>=2.4.0
 oslo.concurrency>=3.8.0         # Apache-2.0
 oslo.i18n>=2.1.0  # Apache-2.0
-#launchpadlib         # Only for migration
\ No newline at end of file
+#launchpadlib         # Only for migration
diff --git a/setup.cfg b/setup.cfg
index 63e21f81..1f08f3cd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,14 +1,19 @@
 [metadata]
-name = storyboard
-summary = OpenStack Story Tracking
+name = storyboard-api
+summary = StoryBoard Task Tracker API Service
 description-file =
     README.rst
-author = OpenStack
+description-content-type = text/x-rst; charset=UTF-8
+author = OpenDev
 author-email = openstack-discuss@lists.openstack.org
-home-page = https://www.openstack.org/
+home-page = https://docs.openstack.org/infra/storyboard
+project_urls =
+    Browse Source = https://opendev.org/opendev/storyboard
+    Bug Reporting = https://storyboard.openstack.org/#!/project/opendev/storyboard
+    Documentation = https://docs.openstack.org/infra/storyboard
+    Git Clone URL = https://opendev.org/opendev/storyboard
 classifier =
-    Environment :: OpenStack
-    Framework :: Pecan/WSME
+    Environment :: Web Environment
     Intended Audience :: Developers
     Intended Audience :: Information Technology
     Intended Audience :: System Administrators
@@ -17,7 +22,9 @@ classifier =
     Operating System :: POSIX :: Linux
     Programming Language :: Python
     Programming Language :: Python :: 2.7
-    Topic :: Internet :: WWW/HTTP
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.5
+    Topic :: Software Development :: Bug Tracking
 
 [files]
 packages =
@@ -42,6 +49,9 @@ storyboard.plugin.user_preferences =
 storyboard.plugin.scheduler =
     token-cleaner = storyboard.plugin.token_cleaner.cleaner:TokenCleaner
 
+[wheel]
+universal = 1
+
 [build_sphinx]
 warning-is-error = 1
 source-dir = doc/source
diff --git a/setup.py b/setup.py
index 2f8bfd2e..44a94320 100755
--- a/setup.py
+++ b/setup.py
@@ -25,5 +25,5 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr>=1.8'],
+    setup_requires=['pbr>=5'],
     pbr=True)
diff --git a/storyboard/__init__.py b/storyboard/__init__.py
index 11411dfa..c9286a67 100644
--- a/storyboard/__init__.py
+++ b/storyboard/__init__.py
@@ -15,5 +15,4 @@
 import pbr.version
 
 
-__version__ = pbr.version.VersionInfo(
-    'storyboard').version_string()
+__version__ = pbr.version.VersionInfo('storyboard-api').version_string()