Revert "upgrade to py3.10"

This reverts commit 71b1905.

.github/workflows/pull_request.yml

@@ -5,14 +5,14 @@ permissions: {}
 
 jobs:
   pre-commit:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
         uses: actions/checkout@v1
-      - name: Setup python 3.10
+      - name: Setup python 3.8
         uses: actions/setup-python@v1
         with:
-          python-version: 3.10
+          python-version: 3.8
       - name: Install pre-commit
         run: pip install pre-commit
       - name: Run pre-commit
@@ -40,10 +40,10 @@ jobs:
   #    - name: Run license finder
   #      run: license_finder
   test-unit:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     strategy:
         matrix:
-          python-version: ['3.8.x', '3.10.x']
+          python-version: ['3.7.x', '3.8.x']
     steps:
       - name: Checkout
         uses: actions/checkout@v1
@@ -54,7 +54,7 @@ jobs:
       - name: Install apt dependencies
         run: sudo apt-get update && sudo apt-get install -y python3-dev openssl libssl-dev gcc pkg-config libffi-dev libxml2-dev libxmlsec1-dev
       - name: Install dependencies
-        run: pip install -r piptools_requirements.txt && pip install -r requirements.txt 
+        run: pip install -r piptools_requirements.txt && pip install -r piptools_requirements3.txt && pip install -r requirements3.txt 
       - name: Run python unit tests
         run: make test_unit
   test-integration:

.github/workflows/push.yml

@@ -8,14 +8,14 @@ on:
 jobs:
   build-and-deploy-docs:
     name: Build and publish docs
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
         uses: actions/checkout@v1
-      - name: Setup python 3.10
+      - name: Setup python 3.8
         uses: actions/setup-python@v1
         with:
-          python-version: 3.10
+          python-version: 3.8
       - name: Install virtualenv
         run: pip install virtualenv
       - name: Install xmlsec
@@ -33,14 +33,14 @@ jobs:
           FOLDER: generated/docs # The folder the action should deploy.
   build-and-publish-python-module:
     name: Build and publish python module to pypi
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
         uses: actions/checkout@v1
-      - name: Setup python 3.10
+      - name: Setup python 3.8
         uses: actions/setup-python@v1
         with:
-          python-version: 3.10
+          python-version: 3.8
       - name: Add wheel dependency
         run: pip install wheel
       - name: Generate dist

.pre-commit-config.yaml

@@ -13,7 +13,7 @@ repos:
     -   id: mypy
         additional_dependencies:
         -   --no-compile
-        -   cffi==1.16.0
+        -   cffi==1.14.6
         -   cryptography==41.0.1
         -   pycparser==2.21
         -   types-pyopenssl==23.2.0.1

CHANGELOG.md

@@ -1,9 +1,5 @@
 # Changelog
 
-## 6.5.7
-
-* Upgraded to python 3.10
-
 ## 6.4.0
 
 * Updated client with a new logo and updated CSS to match design style guide. The new CSS coloring should

Dockerfile

@@ -13,7 +13,7 @@ RUN apt-get update \
         make nodejs git-core \
         # For backend
         gcc pkg-config \
-        python3.10-dev virtualenv \
+        python3.8-dev virtualenv \
         libffi-dev libxml2-dev libxmlsec1-dev \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
@@ -22,12 +22,13 @@ COPY package.json /srv/confidant/
 RUN npm install grunt-cli && \
     npm install
 
-COPY piptools_requirements.txt requirements.txt /srv/confidant/
+COPY piptools_requirements.txt piptools_requirements3.txt requirements3.txt /srv/confidant/
 
 ENV PATH=/venv/bin:$PATH
-RUN virtualenv /venv --python=/usr/bin/python10 && \
+RUN virtualenv /venv --python=/usr/bin/python3.8 && \
     pip install --no-cache -r piptools_requirements.txt && \
-    pip install --no-cache -r requirements.txt
+    pip install --no-cache -r piptools_requirements3.txt && \
+    pip install --no-cache -r requirements3.txt
 
 COPY .jshintrc Gruntfile.js /srv/confidant/
 COPY confidant/public /srv/confidant/confidant/public

actions_run_integration.sh

@@ -2,5 +2,5 @@
 
 cd /srv/confidant
 apt-get update && apt-get install -y python3-dev openssl libssl-dev gcc pkg-config libffi-dev libxml2-dev libxmlsec1-dev
-pip install -r piptools_requirements.txt && pip install -r requirements.txt
+pip install -r piptools_requirements.txt && pip install -r piptools_requirements3.txt && pip install -r requirements3.txt
 make test_integration

docker-compose.integration.yml

@@ -1,7 +1,7 @@
 version: "3.8"
 services:
   confidant:
-    image: python:3.10
+    image: python:3.8
     init: true
     restart: "no"
     networks:

docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+version: "3.7"
 networks:
   confidant:
     name: confidant

docs/build.sh

@@ -8,7 +8,7 @@ source_venv() {
   VENV_DIR=$1
   if [[ "$VIRTUAL_ENV" == "" ]]; then
     if [[ ! -d "${VENV_DIR}"/venv ]]; then
-      virtualenv "${VENV_DIR}"/venv --python=python3.10
+      virtualenv "${VENV_DIR}"/venv --python=python3.8
     fi
     source "${VENV_DIR}"/venv/bin/activate
   else
@@ -56,7 +56,7 @@ rm -rf "${GENERATED_RST_DIR}"
 mkdir -p "${GENERATED_RST_DIR}"
 
 source_venv "$BUILD_DIR"
-pip install -r "${SCRIPT_DIR}"/requirements.txt
+pip install -r "${SCRIPT_DIR}"/requirements3.txt
 
 rsync -av "${SCRIPT_DIR}"/root/ "${SCRIPT_DIR}"/conf.py "${GENERATED_RST_DIR}"
 

docs/requirements3.txt

@@ -1,4 +1,4 @@
--r ../requirements.txt
+-r ../requirements3.txt
 GitPython==2.0.8
 Jinja2==2.11.3
 Pygments==2.7.4

piptools_requirements.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.10
+# This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
 #    cd ~/src/confidant && run-piptools

piptools_requirements3.txt

@@ -0,0 +1,11 @@
+#
+# This file is autogenerated by pip-compile with Python 3.8
+# by the following command:
+#
+#    cd ~/src/confidant && run-piptools
+#
+
+pip==23.1.2
+    # via -r /code/piptools/bootstrap_ins/requirements.in
+setuptools==68.0.0
+    # via -r /code/piptools/bootstrap_ins/requirements.in

requirements.in

@@ -1,4 +1,4 @@
-# piptools: python3.10
+# piptools: python3.8
 # Flask
 # License: BSD
 # Upstream url: http://github.com/mitsuhiko/flask/
@@ -49,7 +49,7 @@ cryptography>2.3.0
 # Upstream url: https://bitbucket.org/cffi/cffi
 # Use: Required by cryptography package to be installed. This should be removed
 # once crytography updates their depenencies to require cffi>=1.10.0.
-cffi>1.15.0
+cffi>1.10.0,<1.15.0
 
 # License: BSD
 # Upstream url: https://github.com/fengsp/flask-session

requirements.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.10
+# This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
 #    cd ~/src/confidant && run-piptools
@@ -28,7 +28,7 @@ cerberus==1.3.4
     # via -r requirements.in
 certifi==2023.5.7
     # via requests
-cffi==1.16.0
+cffi==1.14.6
     # via
     #   -r requirements.in
     #   cryptography