From db326b31f19f68734146c03af66cb90a03a0fee9 Mon Sep 17 00:00:00 2001 From: Paul Sanders Date: Wed, 6 Jul 2022 03:28:10 -0400 Subject: [PATCH] Fix issue requiring separate install of snowflake-connector-python (#807) * Fix issue requiring separate install of snowflake-connector-python * Update CHANGELOG Co-authored-by: Paul Sanders --- CHANGELOG.md | 2 ++ Dockerfile.app | 3 +-- Dockerfile.worker | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eba5c5879..edf729a7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,8 @@ The types of changes are: ### Fixed * Resolve issue with MyPy seeing files in fidesops as missing imports [#719](https://github.com/ethyca/fidesops/pull/719) * Fixed `check-migrations` Make command [#806](https://github.com/ethyca/fidesops/pull/806) +* Fix issue requiring separate install of snowflake-connector-python [#807](https://github.com/ethyca/fidesops/pull/807) + ## [1.6.1](https://github.com/ethyca/fidesops/compare/1.6.0...1.6.1) ### Added diff --git a/Dockerfile.app b/Dockerfile.app index 38924915a..0f89aed15 100644 --- a/Dockerfile.app +++ b/Dockerfile.app @@ -22,6 +22,7 @@ RUN apt-get update && \ g++ \ gnupg \ gcc \ + python3-wheel \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -45,8 +46,6 @@ RUN if [ "$SKIP_MSSQL_INSTALLATION" != "true" ] ; then apt-get -y --no-install-r # Update pip and install requirements COPY requirements.txt dev-requirements.txt mssql-requirements.txt ./ RUN pip install -U pip \ - && pip install 'cryptography~=3.4.8' \ - && pip install snowflake-connector-python --no-use-pep517 \ && pip install -r requirements.txt -r dev-requirements.txt RUN if [ "$SKIP_MSSQL_INSTALLATION" != "true" ] ; then pip install -U pip -r mssql-requirements.txt ; fi diff --git a/Dockerfile.worker b/Dockerfile.worker index cda7f7f77..d1cc92611 100644 --- a/Dockerfile.worker +++ b/Dockerfile.worker @@ -15,6 +15,7 @@ RUN apt-get update && \ g++ \ gnupg \ gcc \ + python3-wheel \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -37,8 +38,6 @@ RUN if [ "$SKIP_MSSQL_INSTALLATION" != "true" ] ; then apt-get -y install \ # Update pip and install requirements COPY requirements.txt dev-requirements.txt mssql-requirements.txt ./ RUN pip install -U pip \ - && pip install 'cryptography~=3.4.8' \ - && pip install snowflake-connector-python --no-use-pep517 \ && pip install -r requirements.txt -r dev-requirements.txt RUN if [ "$SKIP_MSSQL_INSTALLATION" != "true" ] ; then pip install -U pip -r mssql-requirements.txt ; fi