Skip to content

Commit 49637c3

Browse files
Grouped dependencies together. (#1131)
1 parent e2005e2 commit 49637c3

File tree

6 files changed

+17
-7
lines changed

6 files changed

+17
-7
lines changed

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
typeguard
1+
typeguard==2.7.1

tools/docker/pre-commit.Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
FROM python:3.6
22

3-
RUN pip install black==19.10b0 flake8==3.7.9
3+
COPY tools/tests_dependencies /tests_dependencies
4+
RUN pip install -r /tests_dependencies/black.txt -r /tests_dependencies/flake8.txt
45

56
COPY tools/ci_build/install/buildifier.sh ./buildifier.sh
67
RUN bash buildifier.sh

tools/docker/sanity_check.Dockerfile

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
FROM python:3.5-alpine as flake8-test
22

3-
RUN pip install flake8==3.7.9
3+
COPY tools/tests_dependencies/flake8.txt ./
4+
RUN pip install -r flake8.txt
45
COPY ./ /addons
56
WORKDIR /addons
67
RUN flake8
@@ -9,7 +10,8 @@ RUN touch /ok.txt
910
# -------------------------------
1011
FROM python:3.6 as black-test
1112

12-
RUN pip install black==19.10b0
13+
COPY tools/tests_dependencies/black.txt ./
14+
RUN pip install -r black.txt
1315
COPY ./ /addons
1416
RUN black --check /addons
1517
RUN touch /ok.txt
@@ -19,8 +21,11 @@ FROM python:3.6 as public-api-typed
1921

2022
COPY build_deps/build-requirements-cpu.txt ./
2123
RUN pip install -r build-requirements-cpu.txt
22-
RUN pip install typeguard==2.7.1
23-
RUN pip install typedapi==0.2.0
24+
COPY requirements.txt ./
25+
RUN pip install -r requirements.txt
26+
COPY tools/tests_dependencies/typedapi.txt ./
27+
RUN pip install -r typedapi.txt
28+
2429

2530
COPY ./ /addons
2631
RUN TF_ADDONS_NO_BUILD=1 pip install --no-deps -e /addons
@@ -87,7 +92,8 @@ FROM python:3.6 as docs_tests
8792

8893
COPY build_deps/build-requirements-cpu.txt ./
8994
RUN pip install -r build-requirements-cpu.txt
90-
RUN pip install typeguard==2.7.1
95+
COPY requirements.txt ./
96+
RUN pip install -r requirements.txt
9197

9298
COPY tools/docs/doc_requirements.txt ./
9399
RUN pip install -r doc_requirements.txt

tools/tests_dependencies/black.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
black==19.10b0

tools/tests_dependencies/flake8.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
flake8==3.7.9

tools/tests_dependencies/typedapi.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
typedapi==0.2.0

0 commit comments

Comments
 (0)