Skip to content

Commit 5813c8c

Browse files
authored
Merge branch 'main' into owl-bot-update-lock-99ab465187b4891e878ee4f9977b4a6aeeb0ceadf404870c416c50e06500eb42
2 parents 4e8f818 + a84b03c commit 5813c8c

File tree

12 files changed

+19
-22
lines changed

12 files changed

+19
-22
lines changed

.github/.OwlBot.lock.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
# limitations under the License.
1414
docker:
1515
image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
16-
digest: sha256:99ab465187b4891e878ee4f9977b4a6aeeb0ceadf404870c416c50e06500eb42
17-
# created: 2024-07-08T16:17:14.833595692Z
16+
digest: sha256:52210e0e0559f5ea8c52be148b33504022e1faef4e95fbe4b32d68022af2fa7e
17+
# created: 2024-07-08T19:25:35.862283192Z

.kokoro/docker/docs/Dockerfile

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ RUN apt-get update \
4040
libssl-dev \
4141
libsqlite3-dev \
4242
portaudio19-dev \
43-
python3-distutils \
4443
redis-server \
4544
software-properties-common \
4645
ssh \
@@ -60,18 +59,22 @@ RUN apt-get update \
6059
&& rm -rf /var/lib/apt/lists/* \
6160
&& rm -f /var/cache/apt/archives/*.deb
6261

63-
###################### Install python 3.9.13
6462

65-
# Download python 3.9.13
66-
RUN wget https://www.python.org/ftp/python/3.9.13/Python-3.9.13.tgz
63+
###################### Install python 3.10.14 for docs/docfx session
64+
65+
# Download python 3.10.14
66+
RUN wget https://www.python.org/ftp/python/3.10.14/Python-3.10.14.tgz
6767

6868
# Extract files
69-
RUN tar -xvf Python-3.9.13.tgz
69+
RUN tar -xvf Python-3.10.14.tgz
7070

71-
# Install python 3.9.13
72-
RUN ./Python-3.9.13/configure --enable-optimizations
71+
# Install python 3.10.14
72+
RUN ./Python-3.10.14/configure --enable-optimizations
7373
RUN make altinstall
7474

75+
RUN python3.10 -m venv /venv
76+
ENV PATH /venv/bin:$PATH
77+
7578
###################### Install pip
7679
RUN wget -O /tmp/get-pip.py 'https://bootstrap.pypa.io/get-pip.py' \
7780
&& python3 /tmp/get-pip.py \
@@ -84,4 +87,4 @@ RUN python3 -m pip
8487
COPY requirements.txt /requirements.txt
8588
RUN python3 -m pip install --require-hashes -r requirements.txt
8689

87-
CMD ["python3.8"]
90+
CMD ["python3.10"]

db_dtypes/__init__.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@
2727
import pyarrow
2828
import pyarrow.compute
2929

30-
31-
from db_dtypes.version import __version__
3230
from db_dtypes import core
33-
31+
from db_dtypes.version import __version__
3432

3533
date_dtype_name = "dbdate"
3634
time_dtype_name = "dbtime"

db_dtypes/core.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
from db_dtypes import pandas_backports
2323

24-
2524
pandas_release = pandas_backports.pandas_release
2625

2726

db_dtypes/pandas_backports.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import pandas.compat.numpy.function
3030
import pandas.core.nanops
3131

32-
3332
pandas_release = packaging.version.parse(pandas.__version__).release
3433

3534
# Create aliases for private methods in case they move in a future version.

noxfile.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import os
2222
import pathlib
2323
import re
24-
import re
2524
import shutil
2625
from typing import Dict, List
2726
import warnings

samples/snippets/pandas_date_and_time.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ def pandas_date_and_time():
1717
# [START bigquery_pandas_date_create]
1818

1919
import datetime
20+
2021
import pandas as pd
22+
2123
import db_dtypes # noqa import to register dtypes
2224

2325
dates = pd.Series([datetime.date(2021, 9, 17), "2021-9-18"], dtype="dbdate")

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import io
1616
import os
1717
import re
18+
1819
from setuptools import setup
1920

2021
# Package metadata.

tests/compliance/date/test_date_compliance.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@
2121
"""
2222

2323
import pandas
24-
from pandas.tests.extension import base
2524
import pandas._testing as tm
25+
from pandas.tests.extension import base
2626
import pytest
2727

2828
import db_dtypes
2929

30-
3130
# TODO(https://github.com/googleapis/python-db-dtypes-pandas/issues/87): Add
3231
# compliance tests for arithmetic operations.
3332

tests/compliance/time/test_time_compliance.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@
2121
"""
2222

2323
import pandas
24-
from pandas.tests.extension import base
2524
import pandas._testing as tm
25+
from pandas.tests.extension import base
2626
import pytest
2727

2828
import db_dtypes
2929

30-
3130
# TODO(https://github.com/googleapis/python-db-dtypes-pandas/issues/87): Add
3231
# compliance tests for arithmetic operations.
3332

tests/unit/test_arrow.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
import db_dtypes
2525

26-
2726
SECOND_NANOS = 1_000_000_000
2827
MINUTE_NANOS = 60 * SECOND_NANOS
2928
HOUR_NANOS = 60 * MINUTE_NANOS

tests/unit/test_date.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import db_dtypes
2626
from db_dtypes import pandas_backports
2727

28-
2928
VALUE_PARSING_TEST_CASES = [
3029
# Min/Max values for pandas.Timestamp.
3130
("1677-09-22", datetime.date(1677, 9, 22)),

0 commit comments

Comments
 (0)