Skip to content

Commit

Permalink
build: remove pbr
Browse files Browse the repository at this point in the history
  • Loading branch information
tobias-urdin committed Jun 28, 2022
1 parent fd0d77a commit 9cb7fae
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 14 deletions.
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ pip-log.txt
# Sphinx
doc/build

# pbr generates these
AUTHORS
ChangeLog

# generated docs
doc/source/api
doc/source/gnocchi.rst
Expand Down
8 changes: 6 additions & 2 deletions gnocchiclient/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@
# under the License.
#

import pbr.version
import pkg_resources


__version__ = pbr.version.VersionInfo('gnocchiclient').version_string()
try:
__version__ = pkg_resources.get_distribution(__name__).version
except pkg_resources.DistributionNotFound:
# package is not installed
pass
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.

pbr>=1.4
cliff>=2.10 # Apache-2.0
ujson
keystoneauth1>=2.0.0
Expand Down
5 changes: 0 additions & 5 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,5 @@ all_files = 1
[upload_sphinx]
upload-dir = doc/build/html

[pbr]
autodoc_index_modules = true
autodoc_exclude_modules =
gnocchiclient.tests.*

[wheel]
universal = 1
12 changes: 10 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,16 @@
import setuptools


cmdclass = {}

try:
from sphinx import setup_command
cmdclass['build_sphinx'] = setup_command.BuildDoc
except ImportError:
pass


setuptools.setup(
setup_requires=['pbr'],
pbr=True,
cmdclass=cmdclass,
py_modules=[],
)

0 comments on commit 9cb7fae

Please sign in to comment.