Implemented / fixed up Python package generation

Author: Ferry Boender

.gitignore

@@ -6,3 +6,6 @@ ansible-cmdb*.deb
 ansible-cmdb*.tar.gz
 ansible-cmdb*.zip
 example/gen_*
+build/
+dist/
+src/ansible_cmdb.egg-info/

Makefile

@@ -11,20 +11,34 @@ test:
 example:
 	example/generate.sh
 
-release_clean: clean
-	@if [ "$(shell git status --porcelain)" != "" ]; then echo "Repo not clean. Not building"; exit 1; fi
-
-release: release_src release_deb release_rpm
-
 doc:
 	markdown_py README.md > README.html
 
-release_src: release_clean doc
-	@echo "Making release for version $(REL_VERSION)"
+clean:
+	rm -rf rel_deb
+	rm -f *.rpm
+	rm -f *.deb
+	rm -f *.tar.gz
+	rm -f *.zip
+	rm -f README.html
+	find ./ -name "*.pyc" -delete
+	find ./ -name "__pycache__" -type d -delete
+	rm -f example/gen_*
+	rm -rf build/
+	rm -rf dist/
+	rm -rf src/ansible_cmdb.egg-info/
 
+release_clean: clean
+	#@if [ "$(shell git status --porcelain)" != "" ]; then echo "Repo not clean. Not building"; exit 1; fi
+
+release_check:
+	@echo "Making release for version $(REL_VERSION)"
 	@if [ -z "$(REL_VERSION)" ]; then echo "REL_VERSION required"; exit 1; fi
 
-	# Cleanup
+release: release_check release_src release_deb release_rpm release_wheel
+
+release_src: release_check release_clean doc
+	# Cleanup. Only on release, since REL_VERSION doesn't exist otherwise
 	rm -rf $(PROG)-$(REL_VERSION)
 
 	# Prepare source
@@ -47,12 +61,7 @@ release_src: release_clean doc
 	zip -q -r $(PROG)-$(REL_VERSION).zip $(PROG)-$(REL_VERSION)
 	tar -czf $(PROG)-$(REL_VERSION).tar.gz  $(PROG)-$(REL_VERSION)
 
-release_deb: release_clean doc
-	@if [ -z "$(REL_VERSION)" ]; then echo "REL_VERSION required"; exit 1; fi
-
-	# Cleanup
-	rm -rf rel_deb
-
+release_deb: release_check release_clean doc
 	mkdir -p rel_deb/usr/bin
 	mkdir -p rel_deb/usr/lib/${PROG}
 	mkdir -p rel_deb/usr/lib/${PROG}/mako
@@ -91,7 +100,7 @@ release_deb: release_clean doc
 	# Lint
 	lintian ansible-cmdb-*.deb
 
-release_rpm: release_clean release_deb
+release_rpm: release_check release_clean release_deb
 	alien -r -g $(PROG)-$(REL_VERSION).deb
 	sed -i '\:%dir "/":d' $(PROG)-$(REL_VERSION)/$(PROG)-$(REL_VERSION)-2.spec
 	sed -i '\:%dir "/usr/":d' $(PROG)-$(REL_VERSION)/$(PROG)-$(REL_VERSION)-2.spec
@@ -102,6 +111,11 @@ release_rpm: release_clean release_deb
 	sed -i '\:%dir "/usr/bin/":d' $(PROG)-$(REL_VERSION)/$(PROG)-$(REL_VERSION)-2.spec
 	cd $(PROG)-$(REL_VERSION) && rpmbuild --buildroot='$(shell readlink -f $(PROG)-$(REL_VERSION))/' -bb --target noarch '$(PROG)-$(REL_VERSION)-2.spec'
 
+release_wheel: release_check release_clean
+	echo "$(REL_VERSION)" > src/ansiblecmdb/data/VERSION
+	python setup.py bdist_wheel --universal
+	echo `git rev-parse --abbrev-ref HEAD | tr "[:lower:]" "[:upper:]"` > src/ansiblecmdb/data/VERSION
+
 install:
 	mkdir -p /usr/local/lib/$(PROG)
 	mkdir -p /usr/local/man/man1
@@ -120,13 +134,3 @@ uninstall:
 	rm -rf /usr/local/lib/$(PROG)
 	rm -f /usr/local/man/man/ansible-cmdb.man.1.gz
 	rm -rf /usr/local/bin/ansible-cmdb
-
-clean:
-	rm -f *.rpm
-	rm -f *.deb
-	rm -f *.tar.gz
-	rm -f *.zip
-	rm -f README.html
-	find ./ -name "*.pyc" -delete
-	find ./ -name "__pycache__" -type d -delete
-	rm -f example/gen_*

setup.py

@@ -11,10 +11,8 @@ def get_long_description():
     with open(path) as f:
         return f.read()
 
-
 def get_version():
-    setup_py = open('setup.py').read()
-    return re.search('version=[\'"]([0-9]+\.[0-9]+(|\.[0-9]+))[\'"]', setup_py, re.MULTILINE).group(1)
+    return open('src/ansiblecmdb/data/VERSION', 'r').read().strip()
 
 def get_data_files(path, strip='', prefix=''):
     data_files = []
@@ -34,25 +32,27 @@ def get_data_files(path, strip='', prefix=''):
 
 setup(
     name='ansible-cmdb',
-    version='1.6',
-    license='BSD',
+    version=get_version(),
+    license='MIT',
     description='Generate host overview from ansible fact gathering output',
     long_description=get_long_description(),
     url='https://github.com/fboender/ansible-cmdb',
 
     author='Ferry Boender',
-    author_email='ferry.boender@gmail.com',
+    author_email='ferry.boender@electricmonk.nl',
 
     package_dir={'': 'src'},
     packages=find_packages('src'),
     include_package_data=True,
     data_files=get_data_files('src/ansiblecmdb/data',
-                              strip='src/ansiblecmdb/',
-                              prefix='ansiblecmdb/'),
+                              strip='src',
+                              prefix='lib/'),
     zip_safe=False,
     install_requires=[
         'mako>=1.0',
-        'pyyaml>=1.0'
+        'pyyaml>=1.0',
+        'ushlex>=0.99',
+        'jsonxs>=0.3',
     ],
     scripts=[
         'src/ansible-cmdb',
@@ -70,6 +70,7 @@ def get_data_files(path, strip='', prefix=''):
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
         'Topic :: System :: Installation/Setup',
         'Topic :: System :: Systems Administration',
         'Topic :: Utilities',

src/ansible-cmdb

@@ -43,7 +43,20 @@ if __name__ == "__main__":
     root.addHandler(ch)
     log = root
 
-    parser = optparse.OptionParser(version="%prog v%%MASTER%%")
+    # Find out our installation prefix and data directory. These can be in
+    # different places depending on how ansible-cmdb was installed.
+    data_dir_paths = [
+        os.path.join(os.path.dirname(ansiblecmdb.__file__), 'data'),
+        '/usr/local/lib/ansiblecmdb/data',
+        '/usr/lib/ansiblecmdb/data',
+    ]
+
+    data_dir = find_path(data_dir_paths, 'tpl/html_fancy.tpl')
+    tpl_dir = os.path.join(data_dir, 'tpl')
+    static_dir = os.path.join(data_dir, 'static')
+    version = open(os.path.join(data_dir, 'VERSION')).read().strip()
+
+    parser = optparse.OptionParser(version="%prog v{}".format(version))
     parser.set_usage(sys.argv[0] + " [option] <dir> > output.html")
     parser.add_option("-t", "--template", dest="template", action="store", default='html_fancy', help="Template to use. Default is 'html_fancy'")
     parser.add_option("-i", "--inventory", dest="inventory", action="store", default=None, help="Inventory to read extra info from")
@@ -61,16 +74,7 @@ if __name__ == "__main__":
     if options.debug:
         root.setLevel(logging.DEBUG)
 
-    # Find out our installation prefix and data directory. These can be in
-    # different places depending on how ansible-cmdb was installed.
-    data_dir_paths = [
-        os.path.join(os.path.dirname(ansiblecmdb.__file__), 'data'),
-        '/usr/local/lib/ansiblecmdb/data',
-        '/usr/lib/ansiblecmdb/data',
-    ]
-    data_dir = find_path(data_dir_paths, 'tpl/html_fancy.tpl')
-    tpl_dir = os.path.join(data_dir, 'tpl')
-    static_dir = os.path.join(data_dir, 'static')
+    # Log some path information
     log.debug('data_dir = {0}'.format(data_dir))
     log.debug('tpl_dir = {0}'.format(tpl_dir))
     log.debug('static_dir = {0}'.format(static_dir))
@@ -100,7 +104,7 @@ if __name__ == "__main__":
     params = {
         'lib_dir': data_dir,  # Backwards compatibility for custom templates < ansible-cmdb v1.7
         'data_dir': data_dir,
-        'version': '%%MASTER%%',
+        'version': version,
         'columns': None,
     }
     if options.params:

src/ansiblecmdb/data/VERSION

@@ -0,0 +1 @@
+MASTER