Merge pull request #1 from xamox/master

I added setuptools so it can be installed as module
oostendo · Feb 14, 2012 · 9980bc0 · 9980bc0
2 parents 1ff5c98 + fd79523
commit 9980bc0
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,5 @@
+build
+build/*
+dist
+dist/*
+*.pyc
diff --git a/MANIFEST b/MANIFEST
@@ -0,0 +1,6 @@
+# file GENERATED by distutils, do NOT edit
+README
+setup.py
+zxing/__init__.py
+zxing/tests.py
+zxing/zxing.py
diff --git a/README.markdown → README b/README.markdown → README
diff --git a/setup.py b/setup.py
@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+
+from distutils.core import setup
+
+setup(
+    name='zxing',
+    version='0.1',
+    description="wrapper for zebra crossing (zxing) barcode library",
+    url='http://simplecv.org',
+    author='Ingenuitas',
+    author_email='public.relations@ingenuitas.com',
+    packages=['zxing'],
+)
diff --git a/zxing.py → zxing/__init__.py b/zxing.py → zxing/__init__.py
@@ -9,6 +9,7 @@
 #  otherwise you must specify the location as a parameter to the constructor
 #
 
+__version__ = '0.2'
 import subprocess, re, os
 
 class BarCodeReader():
@@ -107,3 +108,7 @@ def __init__(self, zxing_output):
           self.points.append((float(m.group(2)), float(m.group(3))))
 
     return
+
+
+if __name__ == "__main__":
+    print "Zxing module"
diff --git a/zxing/__init__.pyc b/zxing/__init__.pyc
diff --git a/sample.png → zxing/sample.png b/sample.png → zxing/sample.png
diff --git a/tests.py → zxing/tests.py b/tests.py → zxing/tests.py
@@ -37,7 +37,8 @@ def test_barcode_parser():
 
 
 def test_codereader():
-  zx = BarCodeReader(zxing_location) 
+  #~ zx = BarCodeReader(zxing_location)
+  zx = BarCodeReader()
 
   barcode = zx.decode(testimage)