8000 Merge branch 'dpebot-repositorygardener' despite flaky dataproc tests · blechdom/python-docs-samples@5e5ea6d · GitHub
[go: up one dir, main page]

Skip to content 8000

Commit 5e5ea6d

Browse files
committed
Merge branch 'dpebot-repositorygardener' despite flaky dataproc tests
2 parents 292837b + 0f26000 commit 5e5ea6d

File tree

42 files changed

+66
-57
lines changed
  • gcs_file_to_device
  • http_example
  • manager
  • mqtt_example
  • scripts
  • kms/api-client
  • language
  • ml_engine/online_prediction
  • monitoring/api/v3/api-client
  • pubsub/cloud-client
  • storage
  • testing
  • video/cloud-client
  • vision/api/label
  • Some content is hidden

    Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

    42 files changed

    +66
    -57
    lines changed
    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,5 +1,5 @@
    11
    Django==2.0.3
    22
    mysqlclient==1.3.12
    3-
    wheel==0.30.0
    3+
    wheel==0.31.0
    44
    gunicorn==19.7.1
    55
    psycopg2==2.7.4
    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,3 +1,3 @@
    11
    Flask==0.12.2
    2-
    google-cloud-pubsub==0.32.1
    2+
    google-cloud-pubsub==0.33.0
    33
    gunicorn==19.7.1
    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,5 +1,5 @@
    11
    Flask==0.12.2
    22
    gunicorn==19.7.1
    33
    numpy==1.14.2
    4-
    scipy==1.0.0
    4+
    scipy==1.0.1
    55
    Pillow==5.0.0
    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,3 +1,3 @@
    11
    Flask==0.12.2
    22
    gunicorn==19.7.1
    3-
    twilio==6.10.5
    3+
    twilio==6.11.0
    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,3 +1,3 @@
    1-
    google-api-python-client==1.6.5
    1+
    google-api-python-client==1.6.6
    22
    google-auth==1.4.1
    33
    google-auth-httplib2==0.0.3

    appengine/standard/firebase/firenotes/backend/requirements.txt

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,5 +1,5 @@
    11
    Flask==0.12.2
    2-
    pyjwt==1.6.0
    2+
    pyjwt==1.6.1
    33
    flask-cors==3.0.3
    44
    google-auth==1.4.1
    55
    requests==2.18.4
    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1 +1 @@
    1-
    httplib2==0.10.3
    1+
    httplib2==0.11.3
    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,3 +1,3 @@
    1-
    google-api-python-client==1.6.5
    1+
    google-api-python-client==1.6.6
    22
    google-auth==1.4.1
    33
    google-auth-httplib2==0.0.3

    auth/api-client/requirements.txt

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,3 +1,3 @@
    1-
    google-api-python-client==1.6.5
    1+
    google-api-python-client==1.6.6
    22
    google-auth-httplib2==0.0.3
    33
    google-auth==1.4.1

    auth/end-user/web/requirements.txt

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,6 +1,6 @@
    11
    google-auth==1.4.1
    22
    google-auth-oauthlib==0.2.0
    33
    google-auth-httplib2==0.0.3
    4-
    google-api-python-client==1.6.5
    4+
    google-api-python-client==1.6.6
    55
    flask==0.12.2
    66
    requests==2.18.4

    compute/api/requirements.txt

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,3 +1,3 @@
    1-
    google-api-python-client==1.6.5
    1+
    google-api-python-client==1.6.6
    22
    google-auth==1.4.1
    33
    google-auth-httplib2==0.0.3

    compute/auth/requirements.txt

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,4 +1,4 @@
    11
    requests==2.18.4
    2-
    google-api-python-client==1.6.5
    2+
    google-api-python-client==1.6.6
    33
    google-auth==1.4.1
    44
    google-auth-httplib2==0.0.3

    compute/encryption/requirements.txt

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,5 +1,5 @@
    1-
    cryptography==2.1.4
    1+
    cryptography==2.2.2
    22
    requests==2.18.4
    3-
    google-api-python-client==1.6.5
    3+
    google-api-python-client==1.6.6
    44
    google-auth==1.4.1
    55
    google-auth-httplib2==0.0.3
    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,3 +1,3 @@
    1-
    google-api-python-client==1.6.5
    1+
    google-api-python-client==1.6.6
    22
    google-auth==1.4.1
    33
    google-auth-httplib2==0.0.3
    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,5 +1,5 @@
    11
    Django==2.0.3
    22
    mysqlclient==1.3.12
    3-
    wheel==0.30.0
    3+
    wheel==0.31.0
    44
    gunicorn==19.7.1
    55
    psycopg2==2.7.4

    dataproc/requirements.txt

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,4 +1,4 @@
    1-
    google-api-python-client==1.6.5
    1+
    google-api-python-client==1.6.6
    22
    google-auth==1.4.1
    33
    google-auth-httplib2==0.0.3
    44
    google-cloud==0.32.0

    dlp/requirements.txt

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,5 +1,5 @@
    1-
    google-cloud-dlp==0.2.0
    1+
    google-cloud-dlp==0.3.0
    22
    google-cloud-storage==1.8.0
    3-
    google-cloud-pubsub==0.32.1
    3+
    google-cloud-pubsub==0.33.0
    44
    google-cloud-datastore==1.6.0
    55
    google-cloud-bigquery==0.31.0
    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,3 +1,3 @@
    1-
    google-api-python-client==1.6.5
    1+
    google-api-python-client==1.6.6
    22
    google-auth==1.4.1
    33
    google-auth-httplib2==0.0.3

    iap/requirements.txt

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,5 +1,5 @@
    1-
    PyJWT==1.6.0
    2-
    cryptography==2.1.4
    1+
    PyJWT==1.6.1
    2+
    cryptography==2.2.2
    33
    flask==0.12.2
    44
    google-auth==1.4.1
    55
    gunicorn==19.7.1
    Lines changed: 4 additions & 4 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,7 +1,7 @@
    1-
    cryptography==2.1.4
    2-
    google-api-python-client==1.6.5
    1+
    cryptography==2.2.2
    2+
    google-api-python-client==1.6.6
    33
    google-auth-httplib2==0.0.3
    44
    google-auth==1.4.1
    5-
    google-cloud-pubsub==0.32.1
    6-
    pyjwt==1.6.0
    5+
    google-cloud-pubsub==0.33.0
    6+
    pyjwt==1.6.1
    77
    paho-mqtt==1.3.1
    Lines changed: 4 additions & 4 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,8 +1,8 @@
    1-
    google-api-python-client==1.6.5
    1+
    google-api-python-client==1.6.6
    22
    google-auth==1.4.1
    33
    google-auth-httplib2==0.0.3
    4-
    google-cloud-pubsub==0.32.1
    4+
    google-cloud-pubsub==0.33.0
    55
    google-cloud-storage==1.8.0
    6-
    cryptography==2.1.4
    6+
    cryptography==2.2.2
    77
    paho-mqtt==1.3.1
    8-
    pyjwt==1.6.0
    8+
    pyjwt==1.6.1
    Lines changed: 4 additions & 4 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,7 +1,7 @@
    1-
    cryptography==2.1.4
    2-
    google-api-python-client==1.6.5
    1+
    cryptography==2.2.2
    2+
    google-api-python-client==1.6.6
    33
    google-auth-httplib2==0.0.3
    44
    google-auth==1.4.1
    5-
    google-cloud-pubsub==0.32.1
    6-
    pyjwt==1.6.0
    5+
    google-cloud-pubsub==0.33.0
    6+
    pyjwt==1.6.1
    77
    requests==2.18.4
    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,4 +1,4 @@
    1-
    google-api-python-client==1.6.5
    1+
    google-api-python-client==1.6.6
    22
    google-auth-httplib2==0.0.3
    33
    google-auth==1.4.1
    44
    google-cloud==0.32.0
    Lines changed: 4 additions & 4 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,7 +1,7 @@
    1-
    google-api-python-client==1.6.5
    1+
    google-api-python-client==1.6.6
    22
    google-auth-httplib2==0.0.3
    33
    google-auth==1.4.1
    4-
    google-cloud-pubsub==0.32.1
    5-
    cryptography==2.1.4
    6-
    pyjwt==1.6.0
    4+
    google-cloud-pubsub==0.33.0
    5+
    cryptography==2.2.2
    6+
    pyjwt==1.6.1
    77
    paho-mqtt==1.3.1
    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1 +1 @@
    1-
    google-cloud-pubsub==0.32.1
    1+
    google-cloud-pubsub==0.33.0

    kms/api-client/requirements.txt

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,3 +1,3 @@
    1-
    google-api-python-client==1.6.5
    1+
    google-api-python-client==1.6.6
    22
    google-auth==1.4.1
    33
    google-auth-httplib2==0.0.3

    language/api/requirements.txt

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,3 +1,3 @@
    1-
    google-api-python-client==1.6.5
    1+
    google-api-python-client==1.6.6
    22
    google-auth==1.4.1
    33
    google-auth-httplib2==0.0.3

    language/movie_nl/requirements.txt

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,4 +1,4 @@
    1-
    google-api-python-client==1.6.5
    1+
    google-api-python-client==1.6.6
    22
    google-auth==1.4.1
    33
    google-auth-httplib2==0.0.3
    44
    requests==2.18.4

    language/ocr_nl/requirements.txt

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,3 +1,3 @@
    1-
    google-api-python-client==1.6.5
    1+
    google-api-python-client==1.6.6
    22
    google-auth==1.4.1
    33
    google-auth-httplib2==0.0.3
    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,3 +1,3 @@
    1-
    google-api-python-client==1.6.5
    1+
    google-api-python-client==1.6.6
    22
    google-auth==1.4.1
    33
    google-auth-httplib2==0.0.3

    language/tutorial/requirements.txt

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,3 +1,3 @@
    1-
    google-api-python-client==1.6.5
    1+
    google-api-python-client==1.6.6
    22
    google-auth==1.4.1
    33
    google-auth-httplib2==0.0.3
    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,4 +1,4 @@
    1-
    tensorflow==1.6.0
    2-
    google-api-python-client==1.6.5
    1+
    tensorflow==1.7.0
    2+
    google-api-python-client==1.6.6
    33
    google-auth==1.4.1
    44
    google-auth-httplib2==0.0.3
    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,3 +1,3 @@
    1-
    google-api-python-client==1.6.5
    1+
    google-api-python-client==1.6.6
    22
    google-auth==1.4.1
    33
    google-auth-httplib2==0.0.3

    pubsub/cloud-client/requirements.txt

    Lines changed: 4 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,2 +1,6 @@
    1+
    <<<<<<< HEAD
    2+
    google-cloud-pubsub==0.33.0
    3+
    =======
    14
    google-cloud-pubsub==0.32.1
    25
    futures==3.1.1; python_version < '3'
    6+
    >>>>>>> master

    storage/api/requirements.txt

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,3 +1,3 @@
    1-
    google-api-python-client==1.6.5
    1+
    google-api-python-client==1.6.6
    22
    google-auth==1.4.1
    33
    google-auth-httplib2==0.0.3

    storage/cloud-client/requirements.txt

    Lines changed: 5 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,2 +1,7 @@
    1+
    <<<<<<< HEAD
    2+
    google-cloud-storage==1.8.0
    3+
    google-cloud-pubsub==0.33.0
    4+
    =======
    15
    google-cloud-storage==1.10.0
    26
    google-cloud-pubsub==0.32.1
    7+
    >>>>>>> master
    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,3 +1,3 @@
    1-
    google-api-python-client==1.6.5
    1+
    google-api-python-client==1.6.6
    22
    google-auth==1.4.1
    33
    google-auth-httplib2==0.0.3

    testing/requirements.txt

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -6,12 +6,12 @@ mock==2.0.0
    66
    mysql-python==1.2.5; python_version < "3.0"
    77
    PyCrypto==2.6.1
    88
    pytest-cov==2.5.1
    9-
    pytest==3.4.2
    9+
    pytest==3.5.0
    1010
    pyyaml==3.12
    1111
    responses==0.8.1
    1212
    WebTest==2.0.29
    1313
    webapp2==2.5.2
    14-
    google-api-python-client==1.6.5
    14+
    google-api-python-client==1.6.6
    1515
    google-cloud-core==0.28.1
    1616
    gcp-devrel-py-tools==0.0.14
    1717
    flask==0.12.2
    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1 +1 @@
    1-
    google-cloud-videointelligence==1.0.1
    1+
    google-cloud-videointelligence==1.1.0
    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1 +1 @@
    1-
    google-cloud-videointelligence==1.0.1
    1+
    google-cloud-videointelligence==1.1.0
    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1 +1 @@
    1-
    google-cloud-videointelligence==1.0.1
    1+
    google-cloud-videointelligence==1.1.0

    vision/api/label/requirements.txt

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,3 +1,3 @@
    1-
    google-api-python-client==1.6.5
    1+
    google-api-python-client==1.6.6
    22
    google-auth==1.4.1
    33
    google-auth-httplib2==0.0.3

    0 commit comments

    Comments
     (0)
    0