Merge pull request #14 from Venafi/fix-pypi-package

Fix pypi package
Venafi · Aug 13, 2019 · e8be5b2 · e8be5b2
2 parents 2444b7e + ecf812f
commit e8be5b2
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,5 +3,5 @@
 credentials
 openrc
 tests/__pycache__
-venafi_openstack_heat_plugin.egg-info/*
-
+openstack_heat_plugin_venafi.egg-info
+dist
diff --git a/Makefile b/Makefile
@@ -60,7 +60,10 @@ e2e_show:
 	openstack stack output show $(STACK_NAME)  venafi_certificate
 	openstack stack output show $(STACK_NAME)  venafi_certificate -c output_value -f shell
 
-publish:
+package:
 	rm -rf dist/
+	rm -rf openstack_heat_plugin_venafi.egg-info
 	python3 setup.py sdist bdist_wheel
+
+upload:
 	twine upload dist/*
diff --git a/setup.py b/setup.py
@@ -17,17 +17,19 @@
 
 from __future__ import absolute_import, print_function, unicode_literals
 from setuptools import setup
-
+from setuptools import find_packages
 
 setup(
     name='openstack-heat-plugin-venafi',
     description='Venafi Inc. OpenStack Heat Plugin',
+    long_description='Venafi Inc. OpenStack Heat Plugin',
     license='Apache License, Version 2.0',
-    version=u"0.0.7",
+    version=u"0.0.10",
     author='Venafi Inc.',
     author_email='[email protected]',
     url='https://github.com/Venafi/openstack-heat-plugin-venafi',
     keywords=['venafi', 'openstack', 'heat', 'ssl', 'certificates'],
+    packages=find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
     install_requires=[
         'vcert >= 0.6.1'
     ],

diff --git a/venafi/__init__.py → venafi-openstack-heat-plugin/__init__.py b/venafi/__init__.py → venafi-openstack-heat-plugin/__init__.py
@@ -1,2 +1,2 @@
-__version__ = u'0.0.7'
+__version__ = u'0.0.10'
 __openstackrelease__ = u'newton'
diff --git a/venafi/resources/__init__.py → ...enstack-heat-plugin/resources/__init__.py b/venafi/resources/__init__.py → ...enstack-heat-plugin/resources/__init__.py
diff --git a/venafi/resources/tests/__init__.py → ...k-heat-plugin/resources/tests/__init__.py b/venafi/resources/tests/__init__.py → ...k-heat-plugin/resources/tests/__init__.py
diff --git a/...tests/deploy_venafi_certificate_plugin.py → ...tests/deploy_venafi_certificate_plugin.py b/...tests/deploy_venafi_certificate_plugin.py → ...tests/deploy_venafi_certificate_plugin.py
diff --git a/...esources/tests/fixtures/random_string.yml → ...esources/tests/fixtures/random_string.yml b/...esources/tests/fixtures/random_string.yml → ...esources/tests/fixtures/random_string.yml
diff --git a/...urces/tests/fixtures/test_certificate.yml → ...urces/tests/fixtures/test_certificate.yml b/...urces/tests/fixtures/test_certificate.yml → ...urces/tests/fixtures/test_certificate.yml
diff --git a/...fixtures/test_certificate_output_only.yml → ...fixtures/test_certificate_output_only.yml b/...fixtures/test_certificate_output_only.yml → ...fixtures/test_certificate_output_only.yml
diff --git a/...esources/tests/test_venafi_certificate.py → ...esources/tests/test_venafi_certificate.py b/...esources/tests/test_venafi_certificate.py → ...esources/tests/test_venafi_certificate.py
diff --git a/venafi/resources/venafi_certificate.py → ...at-plugin/resources/venafi_certificate.py b/venafi/resources/venafi_certificate.py → ...at-plugin/resources/venafi_certificate.py