Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Squash commits from master repository #5

Merged
merged 31 commits into from
Mar 18, 2015
Merged

Commits on Jan 9, 2015

  1. Avoid GCE checking if env var is set to True

    If NO_GCE_CHECK is True we avoid checking for a GCE environment  (_detect_gce_environment is not executed)
    aaronwinter committed Jan 9, 2015
    Configuration menu
    Copy the full SHA
    aec4d81 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    034a9a0 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2015

  1. Merge pull request #1 from google/master

    Pull recent auth2client release (crypt + timeout)
    aaronwinter committed Jan 22, 2015
    Configuration menu
    Copy the full SHA
    7c1b2c7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ac61423 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2015

  1. Merge pull request #3 from google/master

    Backward compatibility update (Google/oauth2client)
    aaronwinter committed Jan 28, 2015
    Configuration menu
    Copy the full SHA
    7d3743d View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2015

  1. Configuration menu
    Copy the full SHA
    8547303 View commit details
    Browse the repository at this point in the history
  2. Modify test to check for equality

    Use '==' or '!=' instead of 'is' or 'is not'.
    aaronwinter committed Jan 30, 2015
    Configuration menu
    Copy the full SHA
    933e1d0 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #111 from aaronwinter/master

    Avoid GCE checking if NO_GCE_CHECK is True
    craigcitro committed Jan 30, 2015
    Configuration menu
    Copy the full SHA
    413bb81 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2015

  1. added test file for tools module containing a test for the ClientRedi…

    …rectServer and ClientRedirect classes
    kcs committed Feb 1, 2015
    Configuration menu
    Copy the full SHA
    927589b View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2015

  1. Fixing JSON key service account assertions in Python3.

    Fixes #125.
    
    NOTE: '%s.%s' does not behave the same between versions and should
          be removed throughout this library.
    
    I will be following this up with a set of regression tests (hopefully
    some of which will fail) and we can assess the damage of other uses
    of '%s'.
    dhermes committed Feb 4, 2015
    Configuration menu
    Copy the full SHA
    ec6e51c View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2015

  1. Merge pull request #126 from dhermes/fix-125

    Fixing JSON key service account assertions in Python3.
    craigcitro committed Feb 6, 2015
    Configuration menu
    Copy the full SHA
    cd6a9c4 View commit details
    Browse the repository at this point in the history
  2. Add another form for the PEM key in tests.

    It turns out that the result may be different depending on openSSL versions;
    rather than play games, we just check that we get one of the expected outputs.
    craigcitro committed Feb 6, 2015
    Configuration menu
    Copy the full SHA
    efa2f0f View commit details
    Browse the repository at this point in the history
  3. Merge pull request #117 from craigcitro/classy_tests

    New crypt function test fails with system python2.6 on OSX
    craigcitro committed Feb 6, 2015
    Configuration menu
    Copy the full SHA
    535388c View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2015

  1. Configuration menu
    Copy the full SHA
    ff33c81 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2015

  1. Configuration menu
    Copy the full SHA
    28cc2e0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c6b2318 View commit details
    Browse the repository at this point in the history
  3. Add functools.wraps() to util.positional().

    This forces `util.positional` to correctly wrap the function it produces, in
    particular to fix an issue with generation of docstrings. This also cleans up
    the docstrings for `tools.run_flow` and `old_run.run` to be valid restructured
    text.
    
    Fixes #124.
    craigcitro committed Feb 12, 2015
    Configuration menu
    Copy the full SHA
    cb9d1bf View commit details
    Browse the repository at this point in the history
  4. Merge pull request #130 from craigcitro/docs

    Add functools.wraps() to util.positional().
    nathanielmanistaatgoogle committed Feb 12, 2015
    Configuration menu
    Copy the full SHA
    8bd8b7a View commit details
    Browse the repository at this point in the history
  5. Be more permissive about GAE SDK versions.

    Previously, we always tried to grab the *most* recent SDK version for building
    docs; this change loosens this, to grab the most-recent-and-readable version.
    craigcitro committed Feb 12, 2015
    Configuration menu
    Copy the full SHA
    d2ebff0 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #131 from craigcitro/sdk_fix

    Be more permissive about GAE SDK versions.
    nathanielmanistaatgoogle committed Feb 12, 2015
    Configuration menu
    Copy the full SHA
    b29c1bc View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2015

  1. Fix example to be Python3 compatible, use format()

    Both print() and format() are compatible from 2.6. Also, format() is much nicer to use for internationalization since you can define the location of your substitutions. It works similarly to Java and .net's format() as well. Great stuff!
    
    Should I tackle the other examples as well, or is piece meal all right?
    RandomInsano committed Feb 16, 2015
    Configuration menu
    Copy the full SHA
    7be6069 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3c02a81 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2015

  1. Configuration menu
    Copy the full SHA
    4afd53d View commit details
    Browse the repository at this point in the history
  2. Merge pull request #140 from craigcitro/invalid_assert_statement

    Use assert_called_once_with, which exists, instead of
    assert_called_exactly_once_with, which does not exist.
    nathanielmanistaatgoogle committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    49a6d77 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2015

  1. Better doc building on travis.

    This makes two changes:
    
    * Force `tox` to use a new version of `sphinx`, since we depend on features
      from the `1.3` branch.
    
    * Tweak the `build-docs` script to build on any push. The logic for skipping
      the build in the case of a non-master push was originally in place to
      prevent new docs from being pushed live, but we opted to make that manual
      instead. As a result, this just masks docs errors in pull requests.
    craigcitro committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    07da0fe View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2015

  1. Configuration menu
    Copy the full SHA
    c8eaffa View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2015

  1. Merge pull request #143 from aalexand/support-devshell-credentials

    Adds support for Google Developer Shell session credentials
    nathanielmanistaatgoogle committed Mar 13, 2015
    Configuration menu
    Copy the full SHA
    d68049b View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2015

  1. Fall back to using an access_token for revocation.

    According to the [OAuth2
    docs](https://developers.google.com/accounts/docs/OAuth2WebServer#tokenrevoke),
    we can use either the refresh token or access token when revoking a token. If
    we've lost the refresh token for some reason, we should fall back to revoking
    via access token. (Note that if the access token has expired, this will still
    raise, which is the correct behavior.)
    
    Fixes #132.
    craigcitro committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    b574bc2 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #134 from craigcitro/revoke

    Fall back to using an access_token for revocation.
    craigcitro committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    7504459 View commit details
    Browse the repository at this point in the history
  3. Release v1.4.7.

    craigcitro committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    468f592 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #145 from craigcitro/master

    Release v1.4.7.
    nathanielmanistaatgoogle committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    fd054dc View commit details
    Browse the repository at this point in the history