aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Wayne Parrott <jonwayne@google.com>2017-05-09 12:54:17 -0700
committerGitHub <noreply@github.com>2017-05-09 12:54:17 -0700
commitefe567a8f03739a5a340fa9f6909690db340caf6 (patch)
tree0077abb1cb3c675cda1b2a69cfe6dc648680a265
parentcf13958d7d66dfa99492ac0cc91d75e276066be1 (diff)
downloadoauth2client-efe567a8f03739a5a340fa9f6909690db340caf6.tar.gz
Fix ci (#712)
* Add missing docs files * Fix app engine sdk download command * Remove PyPy, as cryptography updates seems to have broken oauth2client support since at least v2.0.0
-rw-r--r--.travis.yml2
-rw-r--r--docs/source/oauth2client.client.rst4
-rw-r--r--docs/source/oauth2client.clientsecrets.rst4
-rw-r--r--docs/source/oauth2client.contrib.appengine.rst4
-rw-r--r--docs/source/oauth2client.contrib.devshell.rst4
-rw-r--r--docs/source/oauth2client.contrib.dictionary_storage.rst4
-rw-r--r--docs/source/oauth2client.contrib.django_util.apps.rst4
-rw-r--r--docs/source/oauth2client.contrib.django_util.decorators.rst4
-rw-r--r--docs/source/oauth2client.contrib.django_util.models.rst4
-rw-r--r--docs/source/oauth2client.contrib.django_util.rst4
-rw-r--r--docs/source/oauth2client.contrib.django_util.signals.rst4
-rw-r--r--docs/source/oauth2client.contrib.django_util.site.rst4
-rw-r--r--docs/source/oauth2client.contrib.django_util.storage.rst4
-rw-r--r--docs/source/oauth2client.contrib.django_util.views.rst4
-rw-r--r--docs/source/oauth2client.contrib.flask_util.rst4
-rw-r--r--docs/source/oauth2client.contrib.gce.rst4
-rw-r--r--docs/source/oauth2client.contrib.keyring_storage.rst4
-rw-r--r--docs/source/oauth2client.contrib.multiprocess_file_storage.rst4
-rw-r--r--docs/source/oauth2client.contrib.rst4
-rw-r--r--docs/source/oauth2client.contrib.sqlalchemy.rst4
-rw-r--r--docs/source/oauth2client.contrib.xsrfutil.rst4
-rw-r--r--docs/source/oauth2client.crypt.rst4
-rw-r--r--docs/source/oauth2client.file.rst4
-rw-r--r--docs/source/oauth2client.service_account.rst4
-rw-r--r--docs/source/oauth2client.tools.rst4
-rw-r--r--docs/source/oauth2client.transport.rst4
-rwxr-xr-xscripts/install.sh4
-rw-r--r--tox.ini2
28 files changed, 53 insertions, 55 deletions
diff --git a/.travis.yml b/.travis.yml
index 818ec58..47570be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,8 +15,6 @@ matrix:
env: TOX_ENV=py34
- python: 3.5
env: TOX_ENV=py35
- - python: pypy
- env: TOX_ENV=pypy
- python: 2.7
env: TOX_ENV=system-tests
- python: 3.4
diff --git a/docs/source/oauth2client.client.rst b/docs/source/oauth2client.client.rst
index f3b1832..edb2f97 100644
--- a/docs/source/oauth2client.client.rst
+++ b/docs/source/oauth2client.client.rst
@@ -1,5 +1,5 @@
-oauth2client.client module
-==========================
+oauth2client\.client module
+===========================
.. automodule:: oauth2client.client
:members:
diff --git a/docs/source/oauth2client.clientsecrets.rst b/docs/source/oauth2client.clientsecrets.rst
index d666564..a839444 100644
--- a/docs/source/oauth2client.clientsecrets.rst
+++ b/docs/source/oauth2client.clientsecrets.rst
@@ -1,5 +1,5 @@
-oauth2client.clientsecrets module
-=================================
+oauth2client\.clientsecrets module
+==================================
.. automodule:: oauth2client.clientsecrets
:members:
diff --git a/docs/source/oauth2client.contrib.appengine.rst b/docs/source/oauth2client.contrib.appengine.rst
index 7f3d5e2..5051495 100644
--- a/docs/source/oauth2client.contrib.appengine.rst
+++ b/docs/source/oauth2client.contrib.appengine.rst
@@ -1,5 +1,5 @@
-oauth2client.contrib.appengine module
-=====================================
+oauth2client\.contrib\.appengine module
+=======================================
.. automodule:: oauth2client.contrib.appengine
:members:
diff --git a/docs/source/oauth2client.contrib.devshell.rst b/docs/source/oauth2client.contrib.devshell.rst
index 20d5c41..66691bd 100644
--- a/docs/source/oauth2client.contrib.devshell.rst
+++ b/docs/source/oauth2client.contrib.devshell.rst
@@ -1,5 +1,5 @@
-oauth2client.contrib.devshell module
-====================================
+oauth2client\.contrib\.devshell module
+======================================
.. automodule:: oauth2client.contrib.devshell
:members:
diff --git a/docs/source/oauth2client.contrib.dictionary_storage.rst b/docs/source/oauth2client.contrib.dictionary_storage.rst
index 1b59a2c..b94a079 100644
--- a/docs/source/oauth2client.contrib.dictionary_storage.rst
+++ b/docs/source/oauth2client.contrib.dictionary_storage.rst
@@ -1,5 +1,5 @@
-oauth2client.contrib.dictionary_storage module
-==============================================
+oauth2client\.contrib\.dictionary\_storage module
+=================================================
.. automodule:: oauth2client.contrib.dictionary_storage
:members:
diff --git a/docs/source/oauth2client.contrib.django_util.apps.rst b/docs/source/oauth2client.contrib.django_util.apps.rst
index b7c91ae..1ffe1af 100644
--- a/docs/source/oauth2client.contrib.django_util.apps.rst
+++ b/docs/source/oauth2client.contrib.django_util.apps.rst
@@ -1,5 +1,5 @@
-oauth2client.contrib.django_util.apps module
-============================================
+oauth2client\.contrib\.django\_util\.apps module
+================================================
.. automodule:: oauth2client.contrib.django_util.apps
:members:
diff --git a/docs/source/oauth2client.contrib.django_util.decorators.rst b/docs/source/oauth2client.contrib.django_util.decorators.rst
index 07350bc..2eb9dcf 100644
--- a/docs/source/oauth2client.contrib.django_util.decorators.rst
+++ b/docs/source/oauth2client.contrib.django_util.decorators.rst
@@ -1,5 +1,5 @@
-oauth2client.contrib.django_util.decorators module
-==================================================
+oauth2client\.contrib\.django\_util\.decorators module
+======================================================
.. automodule:: oauth2client.contrib.django_util.decorators
:members:
diff --git a/docs/source/oauth2client.contrib.django_util.models.rst b/docs/source/oauth2client.contrib.django_util.models.rst
index 4be59d3..91d3b8d 100644
--- a/docs/source/oauth2client.contrib.django_util.models.rst
+++ b/docs/source/oauth2client.contrib.django_util.models.rst
@@ -1,5 +1,5 @@
-oauth2client.contrib.django_util.models module
-==============================================
+oauth2client\.contrib\.django\_util\.models module
+==================================================
.. automodule:: oauth2client.contrib.django_util.models
:members:
diff --git a/docs/source/oauth2client.contrib.django_util.rst b/docs/source/oauth2client.contrib.django_util.rst
index f60195a..8247134 100644
--- a/docs/source/oauth2client.contrib.django_util.rst
+++ b/docs/source/oauth2client.contrib.django_util.rst
@@ -1,5 +1,5 @@
-oauth2client.contrib.django_util package
-========================================
+oauth2client\.contrib\.django\_util package
+===========================================
Submodules
----------
diff --git a/docs/source/oauth2client.contrib.django_util.signals.rst b/docs/source/oauth2client.contrib.django_util.signals.rst
index 70b5d2d..9a18252 100644
--- a/docs/source/oauth2client.contrib.django_util.signals.rst
+++ b/docs/source/oauth2client.contrib.django_util.signals.rst
@@ -1,5 +1,5 @@
-oauth2client.contrib.django_util.signals module
-===============================================
+oauth2client\.contrib\.django\_util\.signals module
+===================================================
.. automodule:: oauth2client.contrib.django_util.signals
:members:
diff --git a/docs/source/oauth2client.contrib.django_util.site.rst b/docs/source/oauth2client.contrib.django_util.site.rst
index a271b98..5f5dae0 100644
--- a/docs/source/oauth2client.contrib.django_util.site.rst
+++ b/docs/source/oauth2client.contrib.django_util.site.rst
@@ -1,5 +1,5 @@
-oauth2client.contrib.django_util.site module
-============================================
+oauth2client\.contrib\.django\_util\.site module
+================================================
.. automodule:: oauth2client.contrib.django_util.site
:members:
diff --git a/docs/source/oauth2client.contrib.django_util.storage.rst b/docs/source/oauth2client.contrib.django_util.storage.rst
index 393e738..4340a4c 100644
--- a/docs/source/oauth2client.contrib.django_util.storage.rst
+++ b/docs/source/oauth2client.contrib.django_util.storage.rst
@@ -1,5 +1,5 @@
-oauth2client.contrib.django_util.storage module
-===============================================
+oauth2client\.contrib\.django\_util\.storage module
+===================================================
.. automodule:: oauth2client.contrib.django_util.storage
:members:
diff --git a/docs/source/oauth2client.contrib.django_util.views.rst b/docs/source/oauth2client.contrib.django_util.views.rst
index 4cbbea0..dfba37f 100644
--- a/docs/source/oauth2client.contrib.django_util.views.rst
+++ b/docs/source/oauth2client.contrib.django_util.views.rst
@@ -1,5 +1,5 @@
-oauth2client.contrib.django_util.views module
-=============================================
+oauth2client\.contrib\.django\_util\.views module
+=================================================
.. automodule:: oauth2client.contrib.django_util.views
:members:
diff --git a/docs/source/oauth2client.contrib.flask_util.rst b/docs/source/oauth2client.contrib.flask_util.rst
index 8ff2355..c11c9ba 100644
--- a/docs/source/oauth2client.contrib.flask_util.rst
+++ b/docs/source/oauth2client.contrib.flask_util.rst
@@ -1,5 +1,5 @@
-oauth2client.contrib.flask_util module
-======================================
+oauth2client\.contrib\.flask\_util module
+=========================================
.. automodule:: oauth2client.contrib.flask_util
:members:
diff --git a/docs/source/oauth2client.contrib.gce.rst b/docs/source/oauth2client.contrib.gce.rst
index a3748b6..d0b7a15 100644
--- a/docs/source/oauth2client.contrib.gce.rst
+++ b/docs/source/oauth2client.contrib.gce.rst
@@ -1,5 +1,5 @@
-oauth2client.contrib.gce module
-===============================
+oauth2client\.contrib\.gce module
+=================================
.. automodule:: oauth2client.contrib.gce
:members:
diff --git a/docs/source/oauth2client.contrib.keyring_storage.rst b/docs/source/oauth2client.contrib.keyring_storage.rst
index 0fd7476..286e84a 100644
--- a/docs/source/oauth2client.contrib.keyring_storage.rst
+++ b/docs/source/oauth2client.contrib.keyring_storage.rst
@@ -1,5 +1,5 @@
-oauth2client.contrib.keyring_storage module
-===========================================
+oauth2client\.contrib\.keyring\_storage module
+==============================================
.. automodule:: oauth2client.contrib.keyring_storage
:members:
diff --git a/docs/source/oauth2client.contrib.multiprocess_file_storage.rst b/docs/source/oauth2client.contrib.multiprocess_file_storage.rst
index 6f683a0..eb6c0c0 100644
--- a/docs/source/oauth2client.contrib.multiprocess_file_storage.rst
+++ b/docs/source/oauth2client.contrib.multiprocess_file_storage.rst
@@ -1,5 +1,5 @@
-oauth2client.contrib.multiprocess_file_storage module
-=====================================================
+oauth2client\.contrib\.multiprocess\_file\_storage module
+=========================================================
.. automodule:: oauth2client.contrib.multiprocess_file_storage
:members:
diff --git a/docs/source/oauth2client.contrib.rst b/docs/source/oauth2client.contrib.rst
index 98a3d11..644278d 100644
--- a/docs/source/oauth2client.contrib.rst
+++ b/docs/source/oauth2client.contrib.rst
@@ -1,5 +1,5 @@
-oauth2client.contrib package
-============================
+oauth2client\.contrib package
+=============================
Subpackages
-----------
diff --git a/docs/source/oauth2client.contrib.sqlalchemy.rst b/docs/source/oauth2client.contrib.sqlalchemy.rst
index 94eeeec..c4a634e 100644
--- a/docs/source/oauth2client.contrib.sqlalchemy.rst
+++ b/docs/source/oauth2client.contrib.sqlalchemy.rst
@@ -1,5 +1,5 @@
-oauth2client.contrib.sqlalchemy module
-======================================
+oauth2client\.contrib\.sqlalchemy module
+========================================
.. automodule:: oauth2client.contrib.sqlalchemy
:members:
diff --git a/docs/source/oauth2client.contrib.xsrfutil.rst b/docs/source/oauth2client.contrib.xsrfutil.rst
index dd5e8d6..eec497d 100644
--- a/docs/source/oauth2client.contrib.xsrfutil.rst
+++ b/docs/source/oauth2client.contrib.xsrfutil.rst
@@ -1,5 +1,5 @@
-oauth2client.contrib.xsrfutil module
-====================================
+oauth2client\.contrib\.xsrfutil module
+======================================
.. automodule:: oauth2client.contrib.xsrfutil
:members:
diff --git a/docs/source/oauth2client.crypt.rst b/docs/source/oauth2client.crypt.rst
index c3b6acc..d03cf50 100644
--- a/docs/source/oauth2client.crypt.rst
+++ b/docs/source/oauth2client.crypt.rst
@@ -1,5 +1,5 @@
-oauth2client.crypt module
-=========================
+oauth2client\.crypt module
+==========================
.. automodule:: oauth2client.crypt
:members:
diff --git a/docs/source/oauth2client.file.rst b/docs/source/oauth2client.file.rst
index 52a9e94..bf804ff 100644
--- a/docs/source/oauth2client.file.rst
+++ b/docs/source/oauth2client.file.rst
@@ -1,5 +1,5 @@
-oauth2client.file module
-========================
+oauth2client\.file module
+=========================
.. automodule:: oauth2client.file
:members:
diff --git a/docs/source/oauth2client.service_account.rst b/docs/source/oauth2client.service_account.rst
index 0d3b382..c370246 100644
--- a/docs/source/oauth2client.service_account.rst
+++ b/docs/source/oauth2client.service_account.rst
@@ -1,5 +1,5 @@
-oauth2client.service_account module
-===================================
+oauth2client\.service\_account module
+=====================================
.. automodule:: oauth2client.service_account
:members:
diff --git a/docs/source/oauth2client.tools.rst b/docs/source/oauth2client.tools.rst
index 240ad52..86be326 100644
--- a/docs/source/oauth2client.tools.rst
+++ b/docs/source/oauth2client.tools.rst
@@ -1,5 +1,5 @@
-oauth2client.tools module
-=========================
+oauth2client\.tools module
+==========================
.. automodule:: oauth2client.tools
:members:
diff --git a/docs/source/oauth2client.transport.rst b/docs/source/oauth2client.transport.rst
index 1c6dbb0..c5440f1 100644
--- a/docs/source/oauth2client.transport.rst
+++ b/docs/source/oauth2client.transport.rst
@@ -1,5 +1,5 @@
-oauth2client.transport module
-=============================
+oauth2client\.transport module
+==============================
.. automodule:: oauth2client.transport
:members:
diff --git a/scripts/install.sh b/scripts/install.sh
index 16f312f..e1ed5c5 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -20,8 +20,8 @@ pip install --upgrade pip setuptools tox coveralls
# App Engine tests require the App Engine SDK.
if [[ "${TOX_ENV}" == "gae" || "${TOX_ENV}" == "cover" ]]; then
- pip install git+https://github.com/GoogleCloudPlatform/python-repo-tools.git
- gcprepotools download-appengine-sdk `dirname ${GAE_PYTHONPATH}`
+ pip install gcp-devrel-py-tools
+ gcp-devrel-py-tools download-appengine-sdk `dirname ${GAE_PYTHONPATH}`
fi
# Travis ships with an old version of PyPy, so install at least version 2.6.
diff --git a/tox.ini b/tox.ini
index 5fea4fc..b08178e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = flake8,py27,py34,py35,pypy,gae,cover
+envlist = flake8,py27,py34,py35,gae,cover
[testenv]
basedeps = mock>=1.3.0