Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Remove hack from setup.py and version bump.

  • Loading branch information...
commit 13685363927493fccee0d010e0a18d29fa06a2ca 1 parent 8d02adb
Bryce Boe authored March 30, 2012
13  deploy.sh
@@ -6,8 +6,15 @@ if [[ "$status" != "# On branch master" ]]; then
6 6
     exit 1
7 7
 fi
8 8
 
9  
-version=$(python -c "import reddit; print reddit.VERSION")
10  
-read -p "Do you want to deploy $version? [y/n] " input
  9
+version1=$(python -c "import reddit; print reddit.VERSION")
  10
+version2=$(egrep -o "'[0-9.]+'" setup.py)
  11
+
  12
+if [[ "'$version1'" != $version2 ]]; then
  13
+    echo "'$version1' does not match $version2. Goodbye"
  14
+    exit 1
  15
+fi
  16
+
  17
+read -p "Do you want to deploy $version1? [y/n] " input
11 18
 case $input in
12 19
     [Yy]* ) break;;
13 20
     * ) echo "Goodbye"; exit 1;;
@@ -19,7 +26,7 @@ if [ $? -ne 0 ]; then
19 26
     exit 1
20 27
 fi
21 28
 
22  
-git tag -s $version -m "Version $version"
  29
+git tag -s $version1 -m "Version $version1"
23 30
 if [ $? -ne 0 ]; then
24 31
     echo "Tagging version failed. Aborting."
25 32
     exit 1
2  reddit/__init__.py
@@ -31,7 +31,7 @@
31 31
 from reddit.settings import CONFIG
32 32
 
33 33
 
34  
-VERSION = '1.3.0'
  34
+VERSION = '1.3.1'
35 35
 UA_STRING = '%%s PRAW/%s Python/%s %s' % (VERSION,
36 36
                                           sys.version.split()[0],
37 37
                                           platform.platform(True))
19  setup.py
@@ -3,24 +3,9 @@
3 3
 except ImportError:
4 4
     from distutils.core import setup
5 5
 
6  
-try:
7  
-    import six
8  
-except ImportError:
9  
-    # HACK so we can import the VERSION from reddit without needing six first
10  
-    import sys
11  
-    class HackObj(object):
12  
-        def __call__(*args):
13  
-            return HackObj()
14  
-        def __getattr__(*args):
15  
-            return HackObj()
16  
-    sys.modules['six'] = HackObj()
17  
-    sys.modules['six.moves'] = HackObj()
18  
-
19  
-from reddit import VERSION
20  
-
21 6
 setup(
22 7
     name='reddit',
23  
-    version=VERSION,
  8
+    version='1.3.1',
24 9
     author='Timothy Mellor',
25 10
     author_email='timothy.mellor+pip@gmail.com',
26 11
     maintainer='Bryce Boe',
@@ -42,5 +27,5 @@ def __getattr__(*args):
42 27
     license='GPLv3',
43 28
     keywords=['api', 'reddit'],
44 29
     packages=['reddit'],
45  
-    package_data={'reddit': ['*.cfg']},
  30
+    package_data={'': ['COPYING'], 'reddit': ['*.cfg']},
46 31
     install_requires=['six'])

0 notes on commit 1368536

Please sign in to comment.
Something went wrong with that request. Please try again.