Merge pull request #362 from bmbouter/fix-version-string

Another __version__ fix attempt
pulp · Jun 3, 2019 · 7c96237 · 7c96237
2 parents 59a2cd0 + 502b457
commit 7c96237
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -11,7 +11,7 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import pkg_resources
+import pulp_docker
 
 try:
     import sphinx_rtd_theme
@@ -53,9 +53,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = pkg_resources.get_distribution("pulp_docker").version
+version = pulp_docker.__version__
 # The full version, including alpha/beta/rc tags.
-release = pkg_resources.get_distribution("pulp_docker").version
+release = pulp_docker.__version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/pulp_docker/__init__.py b/pulp_docker/__init__.py
@@ -1,6 +1,3 @@
-import pkg_resources
-
-__version__ = pkg_resources.get_distribution("pulp-docker").version
-
+__version__ = '4.0.0b4'
 
 default_app_config = 'pulp_docker.app.PulpDockerPluginAppConfig'