From 427d743edcb25c4dd8f82bd1ef9ce1ecf43e8d89 Mon Sep 17 00:00:00 2001 From: Ryan Barrett Date: Tue, 26 Feb 2019 06:59:42 -0800 Subject: [PATCH] don't use oauth-dropins 2.0 until we're ready for it ...since it drops googleplus. --- .circleci/config.yml | 5 +++-- requirements.txt | 2 +- setup.py | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e10e634a..4baa0cfc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,10 +24,11 @@ jobs: name: Base dependencies command: | apt-get install -y python3 google-cloud-sdk-app-engine-python-extras - # use oauth-dropins master at head. (see pip install -e below.) + # TEMPORARILY use oauth-dropins master at 1.14. (see pip install -e below.) + # TODO: switch back to head once granary 2.0 ships. cd /tmp git clone https://github.com/snarfed/oauth-dropins.git - cd oauth-dropins; git submodule sync; git submodule update --init + cd oauth-dropins; git checkout v1.14; git submodule sync; git submodule update --init - run: name: Python 3 dependencies diff --git a/requirements.txt b/requirements.txt index 21fe55f7..8237b6f4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ jinja2 mf2py>=1.1.2 mf2util>=0.5.0 mox3>=0.24.0 -oauth-dropins>=1.14 +oauth-dropins>=1.14,<2.0 requests>=2.10.0 requests-toolbelt>=0.6.2 urllib3>=1.14 diff --git a/setup.py b/setup.py index 8cdfd851..7ccd4e2d 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ Docs: https://packaging.python.org/en/latest/distributing.html -http://pythonhosted.org/setuptools/setuptools.html +https://setuptools.readthedocs.io/ Based on https://github.com/pypa/sampleproject/blob/master/setup.py """ @@ -51,7 +51,7 @@ def __init__(self, *args, **kwargs): 'jinja2', 'mf2py>=1.1.2', 'mf2util>=0.5.0', - 'oauth-dropins>=1.14', + 'oauth-dropins>=1.14,<2.0', 'requests-toolbelt>=0.6.2', 'requests>=2.10.0', 'urllib3>=1.14',