8000 Merge branch 'master' into vision-set-endpoint · pardeep-tm/python-docs-samples@f4f0703 · GitHub
[go: up one dir, main page]
Skip to content

Commit f4f0703

Browse files
nnegreynnegrey
authored
Merge branch 'master' into vision-set-endpoint
2 parents 6833699 + d0f83df commit f4f0703

File tree

10 files changed

+827
-842
lines changed

10 files changed

+827
-842
lines changed

‎.github/blunderbuss.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@ assign_issues:
33
- dmahugh
44
- kurtisvg
55
- leahecole
6+
- gguuss
7+
- crwilcox
68
assign_prs:
79
- busunkim96
810
- dmahugh
911
- kurtisvg
1012
- leahecole
13+
- gguuss
14+
- crwilcox

‎.kokoro/python2.7/common.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@ action {
3939
# Specify which tests to run
4040
env_vars: {
4141
key: "RUN_TESTS_SESSION"
42-
value: "py2-2.7"
42+
value: "py2"
4343
}

‎bigquery/pandas-gbq-migration/samples_test.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,11 @@ def test_client_library_upload_from_dataframe(temp_dataset):
216216
'my_string': ['a', 'b', 'c'],
217217
'my_int64': [1, 2, 3],
218218
'my_float64': [4.0, 5.0, 6.0],
219+
'my_timestamp': [
220+
pandas.Timestamp("1998-09-04T16:03:14"),
221+
pandas.Timestamp("2010-09-13T12:03:45"),
222+
pandas.Timestamp("2015-10-02T16:00:00")
223+
],
219224
}
220225
)
221226
client = bigquery.Client()
@@ -254,6 +259,11 @@ def test_pandas_gbq_upload_from_dataframe(temp_dataset):
254259
'my_string': ['a', 'b', 'c'],
255260
'my_int64': [1, 2, 3],
256261
'my_float64': [4.0, 5.0, 6.0],
262+
'my_timestamp': [
263+
pandas.Timestamp("1998-09-04T16:03:14"),
264+
pandas.Timestamp("2010-09-13T12:03:45"),
265+
pandas.Timestamp("2015-10-02T16:00:00")
266+
],
257267
}
258268
)
259269
table_id = 'my_dataset.new_table'

‎codelabs/functions/python_powered/main.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
import os
16+
1517
import flask
1618

1719

@@ -55,4 +57,4 @@ def python_powered(request):
5557
Returns:
5658
The response file, a JPG image that says "Python Powered"
5759
"""
58-
return flask.send_file("python_powered.jpg", mimetype="image/jpg")
60+
return flask.send_from_directory(os.getcwd(), "python_powered.jpg", mimetype="image/jpg")

0 commit comments

Comments
 (0)
0