Merge branch 'release/0.2.2'

.travis.yml

@@ -1,19 +1,21 @@
+sudo: false
 language: python
 python:
-  - "2.7"
-  - "pypy"
-
-# command to install dependencies
+- '2.7'
+- pypy
+before_install:
+- ./setup.sh
+- source .dev_env/bin/activate
 install:
-  - pip install .
-  - pip install -r requirements.txt
-
-# environment dependencies
-before_script:
-  - curl -O https://storage.googleapis.com/appengine-sdks/featured/google_appengine_1.9.27.zip
-  - unzip -q google_appengine_1.9.27.zip
-  - ln -s google_appengine/google google
-
-# command to run tests
+- pip install --upgrade setuptools
+- pip install .
+- pip install -r requirements.txt
 script:
-  - python setup.py test
+- python setup.py test
+deploy:
+  provider: pypi
+  user: erichiggins
+  on:
+    tags: true
+  password:
+    secure: Ilet7Gy13l3rHmYDe35uxtGdhj1L3Q9p4KTTe/Q4Oo6CobvvsYgctfDGOFgwrNzy+vYDm9P4usUxu3Em//X46CQ5510YZXkYYQV57CPEbgWRx0Bz1ki221PMtuZkA38PEj5SWBQtQxvseDY7bKbP48XBvrI2GRzcJ8MXBKaPPBI=

CHANGELOG.md

@@ -1,3 +1,9 @@
+0.2.2
+=====
+- Build and file clean-ups.
+- Configure Travis CI to auto-deploy to PyPi.
+
+
 0.2.1
 =====
 - Patch version in order to replace uploaded sdist files on PyPi.

VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

gaek/__init__.py

@@ -2,4 +2,4 @@
 
 __author__ = 'Eric Higgins'
 __email__ = 'erichiggins@gmail.com'
-__version__ = '0.2.1'
+__version__ = '0.2.2'

requirements.txt

@@ -1,2 +1,2 @@
 python-dateutil>=2.4.2
-PyYAML==3.10
+PyYAML~=3.10

requirements_test.txt

@@ -0,0 +1 @@
+nose~=1.3.7

setup.py

@@ -5,35 +5,45 @@
 from setuptools import setup
 from setuptools import find_packages
 
+# https://bugs.python.org/issue15881
+try:
+  import multiprocessing
+except ImportError:
+  pass
 
-with open('VERSION') as version_file:
-    VERSION = version_file.readline().rstrip('\n')
 
-with open('requirements.txt') as requirements_file:
-    requirements = requirements_file.read()
+def readme():
+  with open('README.md') as fp:
+    return fp.read()
+
+
+def version():
+  with open('VERSION') as fp:
+    return fp.readline().rstrip('\n')
+
+
+def requirements():
+  with open('requirements.txt') as fp:
+    return fp.read()
+
+
+def test_requirements():
+  with open('requirements_test.txt') as fp:
+    return fp.read()
 
-with open('test_requirements.txt') as test_requirements_file:
-    test_requirements = test_requirements_file.read()
 
 setup(
     name='gaek',
-    version=VERSION,
+    version=version(),
     description="A collection of useful tools for Python apps running on Google App Engine.",
+    long_description=readme(),
     author="Eric Higgins",
     author_email='erichiggins@gmail.com',
     url='https://github.com/erichiggins/gaek',
-    packages=find_packages(exclude=['tests']),
-    install_requires=requirements,
     license="BSD",
-    keywords='gaek',
-    classifiers=[
-        'Development Status :: 2 - Pre-Alpha',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: BSD License',
-        'Natural Language :: English',
-        "Programming Language :: Python :: 2",
-        'Programming Language :: Python :: 2.7',
-    ],
-    test_suite='tests',
-    tests_require=test_requirements
-)
+    packages=find_packages(exclude=['tests', 'google']),
+    include_package_data=True,
+    install_requires=requirements(),
+    test_suite='nose.collector',
+    tests_require=test_requirements(),
+    zip_safe=False)

setup.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+GAE_SDK_SHA1='abe54d95c4ce6ffc35452e027ca701f5d21dd56a'
+GAE_SDK_FILE='google_appengine_1.9.35.zip'
+
+# Create virtual environment.
+echo 'Creating virtual environment...'
+virtualenv .dev_env
+source .dev_env/bin/activate
+pip install --upgrade ndg-httpsclient
+pip install --upgrade pip
+
+# Download the App Engine SDK.
+echo "Downloading $GAE_SDK_FILE..."
+curl -O https://storage.googleapis.com/appengine-sdks/featured/$GAE_SDK_FILE
+
+echo "Verifying $GAE_SDK_FILE..."
+shasum $GAE_SDK_FILE
+
+echo "Unzipping $GAE_SDK_FILE..."
+unzip -q $GAE_SDK_FILE -d .dev_env/
+rm $GAE_SDK_FILE
+cd .dev_env/lib/python2.7/site-packages/
+ln -s ../../../google_appengine/google google
+cd ../../../../