Merge pull request Clever#13 from Clever/version-in-package

nathanleiby · nathanleiby · commit c8ba63e9d377 · 2014-05-05T12:56:00.000-07:00
Moved VERSION file to clever dir so package is installed correctly
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1 +1 @@
-include *.txt VERSION clever/data/clever.com_ca_bundle.crt
+include *.txt clever/VERSION clever/data/clever.com_ca_bundle.crt
diff --git a/VERSION b/VERSION
diff --git a/clever/VERSION b/clever/VERSION
@@ -0,0 +1 @@
+2.0.2
diff --git a/clever/version.py b/clever/version.py
@@ -1,4 +1,4 @@
 import pkg_resources
 
-version_file = pkg_resources.resource_stream(__name__, "../VERSION")
+version_file = pkg_resources.resource_stream(__name__, "VERSION")
 VERSION = version_file.readline().strip()
diff --git a/publish.sh b/publish.sh
@@ -6,7 +6,7 @@
 # To register a package (before first publish):
 #   python setup.py register
 
-version=`cat VERSION`
+version=`cat clever/VERSION`
 changelog=CHANGELOG.md
 grep $version $changelog >> /dev/null
 if [[ $? -ne 0 ]]; then
diff --git a/setup.py b/setup.py
@@ -34,7 +34,7 @@
       author_email='support@clever.com',
       url='https://clever.com/',
       packages=['clever'],
-      package_data={'clever' : ['data/clever.com_ca_bundle.crt', '../VERSION']},
+      package_data={'clever' : ['data/clever.com_ca_bundle.crt', 'VERSION']},
       install_requires=install_requires,
       #test_suite='test',
 )

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-include *.txt VERSION clever/data/clever.com_ca_bundle.crt`
	`1`	`+include *.txt clever/VERSION clever/data/clever.com_ca_bundle.crt`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`author_email='[email protected]',`
`35`	`35`	`url='https://clever.com/',`
`36`	`36`	`packages=['clever'],`
`37`		`- package_data={'clever' : ['data/clever.com_ca_bundle.crt', '../VERSION']},`
	`37`	`+ package_data={'clever' : ['data/clever.com_ca_bundle.crt', 'VERSION']},`
`38`	`38`	`install_requires=install_requires,`
`39`	`39`	`#test_suite='test',`
`40`	`40`	`)`