Skip to content

Commit

Permalink
don't use oauth-dropins 2.0 until we're ready for it
Browse files Browse the repository at this point in the history
...since it drops googleplus.
  • Loading branch information
snarfed committed Feb 26, 2019
1 parent 0424417 commit 427d743
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
5 changes: 3 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
"""
Expand Down Expand Up @@ -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',
Expand Down

0 comments on commit 427d743

Please sign in to comment.