more setuptools packaging

* move webutil to oauth_dropins.webutil. it's a bit presumptuous to put it at the top level when it's named so broadly.
* switch gdata-python-client from submodule to pip dependency. (i've submitted my two bug fix patches as google/gdata-python-client#27.)
* move appengine_config.py to oauth_dropins, except for vender/virtualenv setup
* update README

Author: snarfed

.gitignore

@@ -1,3 +1,4 @@
+/build/
 /dist/
 /.eggs/
 /*.egg-info

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "gdata-python-client"]
-	path = gdata-python-client
-	url = [email protected]:snarfed/gdata-python-client.git
 [submodule "webutil"]
-	path = webutil
+	path = oauth_dropins/webutil
 	url = [email protected]:snarfed/webutil.git

README.md

@@ -11,39 +11,42 @@ Tumblr, Twitter, and WordPress.com.
 This repo also provides an example demo app, deployed at
 http://oauth-dropins.appspot.com/.
 
-Some dependencies are included as git submodules; others are installed with
-`pip` in a
+Depends on the
+[App Engine Python SDK](https://developers.google.com/appengine/downloads). All
+other dependencies are handled by pip and enumerated in
+[requirements.txt](https://github.com/snarfed/oauth-dropins/blob/master/requirements.txt).
+We recommend that you install with pip in a
 [`virtualenv`](http://docs.python-guide.org/en/latest/dev/virtualenvs/).
 ([App Engine details.](https://cloud.google.com/appengine/docs/python/tools/libraries27#vendoring))
-To get set up:
 
-```shell
-git submodule init
-git submodule update
-virtualenv local
-source local/bin/activate
-pip install -r requirements.txt
-```
-
-Then add this line to the `appengine_config.py` file in your project's root
-directory:
-
-```py
-from oauth_dropins.appengine_config import *
-```
+If you clone the repo directly or want to contribute, see
+[Development](#development) for setup instructions.
 
 This software is released into the public domain. See LICENSE for details.
 
-Related work:
-
-* [Python Social Auth](http://psa.matiasaguirre.net/)
-
 
 Quick start
 ---
 
 Here's a full example of using the Facebook drop-in.
 
+1. Install oauth-dropins into a virtualenv somewhere your App Engine project's
+directory, e.g. `local/`:
+
+```shell
+source local/bin/activate
+pip install oauth-dropins
+```
+
+1. Add this to the `appengine_config.py` file in your project's root directory
+([background](https://cloud.google.com/appengine/docs/python/tools/libraries27#vendoring)):
+
+```py
+from google.appengine.ext import vendor
+vendor.add('local')
+from oauth_dropins.appengine_config import *
+```
+
 1. Put your [Facebook application](https://developers.facebook.com/apps)'s ID
 and secret in two plain text files in your app's root directory,
 `facebook_app_id` and `facebook_app_secret`. (If you use git, you'll probably
@@ -211,7 +214,16 @@ least one of them, but not all.
 
 Development
 ---
-Run the unit tests with `python setup.py test`.
+To get started:
+
+```shell
+git submodule init
+git submodule update
+virtualenv local
+source local/bin/activate
+pip install -r requirements.txt
+python setup.py test
+```
 
 Most dependencies are clean, but we've made patches to some that we haven't
 (yet) tried to push upstream. If we ever switch submodule repos for those
@@ -224,6 +236,10 @@ To convert README.md to README.rst:
 
 `pandoc --from=markdown --to=rst --output=README.rst README.md`
 
+Related work:
+
+* [Python Social Auth](http://psa.matiasaguirre.net/)
+
 TODO:
 
 * Google+ and Blogger need some love:

appengine_config.py

@@ -1,97 +1,7 @@
-"""App Engine settings.
+from oauth_dropins.appengine_config import *
 
-Reads app keys and secrets into constants from these files:
-
-disqus_client_id
-disqus_client_secret
-dropbox_app_key
-dropbox_app_secret
-facebook_app_id
-facebook_app_secret
-facebook_app_id_local
-facebook_app_secret_local
-flickr_app_key
-flickr_app_secret
-google_client_id
-google_client_secret
-instagram_client_id
-instagram_client_secret
-instagram_client_id_local
-instagram_client_secret_local
-twitter_app_key
-twitter_app_secret
-tumblr_app_key
-tumblr_app_secret
-wordpress_client_id
-wordpress_client_secret
-wordpress_client_id_local
-wordpress_client_secret_local
-"""
-
-import os
-import sys
-
-# Load packages in lib/
+# Load packages from virtualenv
+# https://cloud.google.com/appengine/docs/python/tools/libraries27#vendoring
 from google.appengine.ext import vendor
 vendor.add('local')
 
-from webutil.appengine_config import *
-
-# default timeout. the G+ and Instagram APIs use httplib2, which honors this.
-import socket
-socket.setdefaulttimeout(HTTP_TIMEOUT)
-# monkey-patch socket.getdefaulttimeout() because it often gets reset, e.g. by
-# socket.setblocking() and maybe other operations.
-# http://stackoverflow.com/a/8465202/186123
-socket.getdefaulttimeout = lambda: HTTP_TIMEOUT
-
-# Add submodule directories to sys.path so they can be imported.
-#
-# I used to use symlinks and munge sys.modules, but both of those ended up in
-# duplicate instances of modules, which caused problems. Background in
-# https://github.com/snarfed/bridgy/issues/31
-for path in (
-  'gdata-python-client/src',
-  ):
-  path = os.path.join(os.path.dirname(__file__), path)
-  if path not in sys.path:
-    sys.path.append(path)
-
-
-def read(filename):
-  """Returns the contents of filename, or None if it doesn't exist."""
-  if os.path.exists(filename):
-    with open(filename) as f:
-      return f.read().strip()
-
-MOCKFACEBOOK = False
-
-if DEBUG:
-  FACEBOOK_APP_ID = read('facebook_app_id_local')
-  FACEBOOK_APP_SECRET = read('facebook_app_secret_local')
-  INSTAGRAM_CLIENT_ID = read('instagram_client_id_local')
-  INSTAGRAM_CLIENT_SECRET = read('instagram_client_secret_local')
-  WORDPRESS_CLIENT_ID = read('wordpress.com_client_id_local')
-  WORDPRESS_CLIENT_SECRET = read('wordpress.com_client_secret_local')
-  DISQUS_CLIENT_ID = read('disqus_client_id_local')
-  DISQUS_CLIENT_SECRET = read('disqus_client_secret_local')
-else:
-  FACEBOOK_APP_ID = read('facebook_app_id')
-  FACEBOOK_APP_SECRET = read('facebook_app_secret')
-  INSTAGRAM_CLIENT_ID = read('instagram_client_id')
-  INSTAGRAM_CLIENT_SECRET = read('instagram_client_secret')
-  WORDPRESS_CLIENT_ID = read('wordpress.com_client_id')
-  WORDPRESS_CLIENT_SECRET = read('wordpress.com_client_secret')
-  DISQUS_CLIENT_ID = read('disqus_client_id')
-  DISQUS_CLIENT_SECRET = read('disqus_client_secret')
-
-DROPBOX_APP_KEY = read('dropbox_app_key')
-DROPBOX_APP_SECRET = read('dropbox_app_secret')
-FLICKR_APP_KEY = read('flickr_app_key')
-FLICKR_APP_SECRET = read('flickr_app_secret')
-GOOGLE_CLIENT_ID = read('google_client_id')
-GOOGLE_CLIENT_SECRET = read('google_client_secret')
-TUMBLR_APP_KEY = read('tumblr_app_key')
-TUMBLR_APP_SECRET = read('tumblr_app_secret')
-TWITTER_APP_KEY = read('twitter_app_key')
-TWITTER_APP_SECRET = read('twitter_app_secret')

gdata-python-client

@@ -0,0 +1,78 @@
+"""App Engine settings.
+
+Reads app keys and secrets into constants from these files:
+
+disqus_client_id
+disqus_client_secret
+dropbox_app_key
+dropbox_app_secret
+facebook_app_id
+facebook_app_secret
+facebook_app_id_local
+facebook_app_secret_local
+flickr_app_key
+flickr_app_secret
+google_client_id
+google_client_secret
+instagram_client_id
+instagram_client_secret
+instagram_client_id_local
+instagram_client_secret_local
+twitter_app_key
+twitter_app_secret
+tumblr_app_key
+tumblr_app_secret
+wordpress_client_id
+wordpress_client_secret
+wordpress_client_id_local
+wordpress_client_secret_local
+"""
+
+import os
+
+from webutil.appengine_config import *
+
+# default timeout. the G+ and Instagram APIs use httplib2, which honors this.
+import socket
+socket.setdefaulttimeout(HTTP_TIMEOUT)
+# monkey-patch socket.getdefaulttimeout() because it often gets reset, e.g. by
+# socket.setblocking() and maybe other operations.
+# http://stackoverflow.com/a/8465202/186123
+socket.getdefaulttimeout = lambda: HTTP_TIMEOUT
+
+
+def read(filename):
+  """Returns the contents of filename, or None if it doesn't exist."""
+  if os.path.exists(filename):
+    with open(filename) as f:
+      return f.read().strip()
+
+if DEBUG:
+  FACEBOOK_APP_ID = read('facebook_app_id_local')
+  FACEBOOK_APP_SECRET = read('facebook_app_secret_local')
+  INSTAGRAM_CLIENT_ID = read('instagram_client_id_local')
+  INSTAGRAM_CLIENT_SECRET = read('instagram_client_secret_local')
+  WORDPRESS_CLIENT_ID = read('wordpress.com_client_id_local')
+  WORDPRESS_CLIENT_SECRET = read('wordpress.com_client_secret_local')
+  DISQUS_CLIENT_ID = read('disqus_client_id_local')
+  DISQUS_CLIENT_SECRET = read('disqus_client_secret_local')
+else:
+  FACEBOOK_APP_ID = read('facebook_app_id')
+  FACEBOOK_APP_SECRET = read('facebook_app_secret')
+  INSTAGRAM_CLIENT_ID = read('instagram_client_id')
+  INSTAGRAM_CLIENT_SECRET = read('instagram_client_secret')
+  WORDPRESS_CLIENT_ID = read('wordpress.com_client_id')
+  WORDPRESS_CLIENT_SECRET = read('wordpress.com_client_secret')
+  DISQUS_CLIENT_ID = read('disqus_client_id')
+  DISQUS_CLIENT_SECRET = read('disqus_client_secret')
+
+DROPBOX_APP_KEY = read('dropbox_app_key')
+DROPBOX_APP_SECRET = read('dropbox_app_secret')
+FLICKR_APP_KEY = read('flickr_app_key')
+FLICKR_APP_SECRET = read('flickr_app_secret')
+GOOGLE_CLIENT_ID = read('google_client_id')
+GOOGLE_CLIENT_SECRET = read('google_client_secret')
+TUMBLR_APP_KEY = read('tumblr_app_key')
+TUMBLR_APP_SECRET = read('tumblr_app_secret')
+TWITTER_APP_KEY = read('twitter_app_key')
+TWITTER_APP_SECRET = read('twitter_app_secret')

oauth_dropins/appengine_config.py

@@ -16,8 +16,8 @@
 from webob import exc
 
 from oauth_dropins import handlers
-from webutil import util
-from webutil import testutil
+from oauth_dropins.webutil import util
+from oauth_dropins.webutil import testutil
 
 
 class HandlersTest(testutil.HandlerTest):

oauth_dropins/test/test_handlers.py

@@ -6,22 +6,15 @@
 
 Based on https://github.com/pypa/sampleproject/blob/master/setup.py
 """
-import unittest
-
-from setuptools import setup
-
-
-class TestLoader(unittest.TestLoader):
-    def loadTestsFromNames(self, names, _=None):
-        return self.discover(names[0])
+from setuptools import setup, find_packages
 
 
 setup(name='oauth-dropins',
       version='1.0',
       description='Drop-in App Engine OAuth client handlers for many popular sites.',
       long_description=open('README.rst').read(),
       url='https://github.com/snarfed/oauth-dropins',
-      packages=['oauth_dropins', 'webutil'],
+      packages=find_packages(),
       author='Ryan Barrett',
       author_email='[email protected]',
       license='Public domain',
@@ -36,6 +29,7 @@ def loadTestsFromNames(self, names, _=None):
       ],
       keywords='oauth appengine',
       install_requires=[
+          'gdata',
           'google-api-python-client',
           'httplib2',
           'oauthlib',
@@ -44,6 +38,5 @@ def loadTestsFromNames(self, names, _=None):
           'requests-oauthlib',
           'tweepy',
       ],
-      test_loader='setup:TestLoader',
-      test_suite='.',
+      test_suite='oauth_dropins',
 )