Merge pull request #175 from python-escpos/improve/import-capabilities-from-submodule

improve import capabilities from a submodule
2016-09-03 19:16:40 +02:00 · 2016-09-03 19:16:40 +02:00 · 2b17e16737
parent 9662ca6efe f467cacdd8
commit 2b17e16737
6 changed files with 8 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -5,6 +5,7 @@
 $~
 .idea/
 .directory
+.cache/

 # temporary data
 temp
--- a/.gitmodules
+++ b/.gitmodules
@ -0,0 +1,3 @@
+[submodule "capabilities-data"]
+	path = capabilities-data
+	url = https://github.com/mike42/escpos-printer-db.git
--- a/MANIFEST.in
+++ b/MANIFEST.in
@ -3,6 +3,7 @@ include *.txt
 include COPYING
 include INSTALL
 include tox.ini
+include capabilities-data/dist/capabilities.json
 recursive-include doc *.bat
 recursive-include doc *.ico
 recursive-include doc *.py
--- a/1
+++ b/1
@ -0,0 +1 @@
+Subproject commit 8744f9397ef6b58aee502aa75ac1efad31c9f5d7
--- a/setup.py
+++ b/setup.py
@ -72,7 +72,7 @@ setup(
    author='Manuel F Martinez and others',
    author_email='manpaz@bashlinux.com',
    maintainer='Patrick Kanzler',
-    maintainer_email='patrick.kanzler@fablab.fau.de',
+    maintainer_email='dev@pkanzler.de',
    keywords=[
        'ESC/POS',
        'thermoprinter',
--- a/src/escpos/capabilities.json
+++ b/src/escpos/capabilities.json
--- a/src/escpos/capabilities.json
+++ b/src/escpos/capabilities.json
@ -0,0 +1 @@
+../../capabilities-data/dist/capabilities.json
				`@ -0,0 +1 @@`
				`Subproject commit 8744f9397ef6b58aee502aa75ac1efad31c9f5d7`
				`@ -0,0 +1 @@`
				`../../capabilities-data/dist/capabilities.json`