Revert installation of flask-ldapconn (#4620)

* Revert installation of flask-ldapconn

* Do not install git in Docker

---------

Co-authored-by: Chiara Rasi <rasi.chiara@gmacil.com>

.github/workflows/tests_and_cov.yml

@@ -57,7 +57,7 @@ jobs:
           key: ${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ hashFiles('requirements-dev.txt') }}
 
       - name: Install the HTML 2 PDF renderer
-        run: sudo apt-get update || true && sudo apt-get install -y wkhtmltopdf git
+        run: sudo apt-get update || true && sudo apt-get install -y wkhtmltopdf
 
       - name: Install python deps
         run: |

CHANGELOG.md

@@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 About changelog [here](https://keepachangelog.com/en/1.0.0/)
 
+# [4.82.1]
+### Fixed
+- Revert the installation of flask-ldapconn to use the version available on PyPI to be able to push new scout releases to PyPI
+
 ## [4.82]
 ### Added
 - Tooltip for combined score in tables for compounds and overlapping variants

Dockerfile

@@ -12,7 +12,7 @@ COPY requirements.txt .
 # No wheel for indirect pycairo dependency so need build env for it to install
 RUN apt-get update && \
     apt-get -y upgrade && \
-    apt-get -y install --no-install-recommends gcc git libcairo2-dev pkg-config python3-dev
+    apt-get -y install --no-install-recommends gcc libcairo2-dev pkg-config python3-dev
 RUN pip install --no-cache-dir -r requirements.txt
 
 #########
@@ -28,7 +28,7 @@ LABEL about.license="MIT License (MIT)"
 # Install base dependencies
 RUN apt-get update && \
      apt-get -y upgrade && \
-     apt-get -y install -y --no-install-recommends git wkhtmltopdf libpango-1.0-0 libpangocairo-1.0-0 && \
+     apt-get -y install -y --no-install-recommends wkhtmltopdf libpango-1.0-0 libpangocairo-1.0-0 && \
      apt-get clean && \
      rm -rf /var/lib/apt/lists/*
 

Dockerfile-server

@@ -12,7 +12,7 @@ COPY requirements.txt .
 # No wheel for indirect pycairo dependency so need build env for it to install
 RUN apt-get update && \
     apt-get -y upgrade && \
-    apt-get -y install --no-install-recommends gcc git libcairo2-dev pkg-config python3-dev
+    apt-get -y install --no-install-recommends gcc libcairo2-dev pkg-config python3-dev
 RUN pip install --no-cache-dir -r requirements.txt gunicorn
 
 
@@ -29,7 +29,7 @@ LABEL about.license="MIT License (MIT)"
 # Install base dependencies
 RUN apt-get update && \
      apt-get -y upgrade && \
-     apt-get -y install -y --no-install-recommends git wkhtmltopdf libpango-1.0-0 libpangocairo-1.0-0 && \
+     apt-get -y install -y --no-install-recommends wkhtmltopdf libpango-1.0-0 libpangocairo-1.0-0 && \
      apt-get clean && \
      rm -rf /var/lib/apt/lists/*
 

requirements.txt

@@ -29,7 +29,7 @@ importlib_resources
 # webapp login
 authlib
 flask_login
-flask-ldapconn @ git+https://github.com/Clinical-Genomics/flask-ldapconn.git@v0.10.2
+flask-ldapconn
 
 # Parsing
 cyvcf2

scout/__version__.py

@@ -1 +1 @@
-__version__ = "4.82"
+__version__ = "4.82.1"