From 50877f87be5d75fc548e0f3fe02fa5ef4f8e862c Mon Sep 17 00:00:00 2001 From: "Gerber, Mike" Date: Thu, 24 Feb 2022 16:54:56 +0100 Subject: [PATCH] =?UTF-8?q?=E2=9C=94=EF=B8=8F=20Move=20installing=20deps?= =?UTF-8?q?=20to=20Makefile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 3 +-- Makefile | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5508791..ce7c573 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,10 +11,9 @@ jobs: - LC_ALL=C.UTF-8 - PYTHONIOENCODING: utf-8 steps: - - run: apt-get update; apt-get install -y make git curl wget imagemagick - checkout - run: pip3 install --upgrade pip - - run: make install deps-test PIP_INSTALL="pip3 install" + - run: make install deps-test-ubuntu PIP_INSTALL="pip3 install" - run: make coverage - codecov/upload diff --git a/Makefile b/Makefile index 56350f3..97c8639 100644 --- a/Makefile +++ b/Makefile @@ -55,6 +55,9 @@ actevedef_718448162: deps-test: $(PIP_INSTALL) -r requirements-test.txt +deps-test-ubuntu: deps-test + apt-get install -y make git curl wget imagemagick + # Clone OCR-D/assets to ./repo/assets repo/assets: