From b82bfe1e1708326c1076f75961892ac0edc79f88 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Mon, 17 Aug 2020 13:47:26 -0700 Subject: [PATCH] Revert "Add opencv to circleci builds" This reverts commit 2b95d39d9809aab873819c6607699963b8cce5b8. --- .circleci/config.yml | 2 +- docker/Dockerfile | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 607ca5b5e..444447fb8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -77,7 +77,7 @@ jobs: pwd mkdir config build install . /opt/conda/bin/activate root - conda install --yes cython gdal h5py libgdal pytest numpy fftw scipy scons hdf4 hdf5 netcdf4 libgcc libstdcxx-ng cmake astropy opencv + conda install --yes cython gdal h5py libgdal pytest numpy fftw scipy scons hdf4 hdf5 netcdf4 libgcc libstdcxx-ng cmake astropy yum install -y uuid-devel x11-devel motif-devel jq gcc-gfortran ln -s /opt/conda/bin/cython /opt/conda/bin/cython3 cd /opt/conda/lib diff --git a/docker/Dockerfile b/docker/Dockerfile index f671d4fcf..021901f89 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -38,7 +38,6 @@ RUN set -ex \ libgcc \ libstdcxx-ng \ cmake \ - opencv \ && yum install -y uuid-devel x11-devel motif-devel jq \ && ln -sf /opt/conda/bin/cython /opt/conda/bin/cython3 \ && mkdir -p /opt/isce2/src