upgrade to python 3.10 (#428)

.github/workflows/pull_request.yml

@@ -5,21 +5,21 @@ permissions: {}
 
 jobs:
   pre-commit:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v1
-      - name: Setup python 3.8
+      - name: Setup python 3.10
         uses: actions/setup-python@v1
         with:
-          python-version: 3.8
+          python-version: 3.10.14
       - name: Install pre-commit
         run: pip install pre-commit
       - name: Run pre-commit
         run: pre-commit run --all-files
   ## Uncomment once license tests are in and passing
   #license-check:
-  #  runs-on: ubuntu-18.04
+  #  runs-on: ubuntu-22.04
   #  steps:
   #    - name: Checkout
   #      uses: actions/checkout@v1
@@ -40,10 +40,10 @@ jobs:
   #    - name: Run license finder
   #      run: license_finder
   test-unit:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
         matrix:
-          python-version: ['3.7.x', '3.8.x']
+          python-version: ['3.10.x']
     steps:
       - name: Checkout
         uses: actions/checkout@v1
@@ -54,28 +54,28 @@ 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 piptools_requirements3.txt && pip install -r requirements3.txt 
+        run: pip install -r piptools_requirements.txt && pip install -r requirements.txt 
       - name: Run python unit tests
         run: make test_unit
   test-integration:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v1
       - name: Run python integration tests
         run: "make actions_test_integration"
   test-frontend:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v1
       - uses: actions/setup-node@v1
         with:
-          node-version: '8.x'
+          node-version: '20.x'
       - name: Run frontend tests
         run: "npm install grunt-cli && npm install && grunt test"
   build-dist-docker-image:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
       - name: Extract metadata (tags, labels) for Docker

.github/workflows/push.yml

@@ -8,14 +8,14 @@ on:
 jobs:
   build-and-deploy-docs:
     name: Build and publish docs
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v1
-      - name: Setup python 3.8
+      - name: Setup python 3.10
         uses: actions/setup-python@v1
         with:
-          python-version: 3.8
+          python-version: 3.10.14
       - 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-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v1
-      - name: Setup python 3.8
+      - name: Setup python 3.10
         uses: actions/setup-python@v1
         with:
-          python-version: 3.8
+          python-version: 3.10.14
       - name: Add wheel dependency
         run: pip install wheel
       - name: Generate dist
@@ -58,7 +58,7 @@ jobs:
       # GitHub Container Registry).
       packages: write
     name: Build and publish Docker images to GitHub Container Registry
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
       - name: Extract metadata (tags, labels) for Docker

.pre-commit-config.yaml

@@ -13,10 +13,12 @@ repos:
     -   id: mypy
         additional_dependencies:
         -   --no-compile
-        -   cffi==1.14.6
-        -   cryptography==41.0.1
-        -   pycparser==2.21
-        -   types-pyopenssl==23.2.0.1
-        -   types-pytz==2023.3.0.0
-        -   types-pyyaml==6.0.12.10
-        -   types-redis==4.6.0.0
+        -   cffi==1.16.0
+        -   cryptography==43.0.0
+        -   pycparser==2.22
+        -   types-cffi==1.16.0.20240331
+        -   types-pyopenssl==24.1.0.20240722
+        -   types-pytz==2024.1.0.20240417
+        -   types-pyyaml==6.0.12.20240724
+        -   types-redis==4.6.0.20240425
+        -   types-setuptools==71.1.0.20240724

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 6.6.1
+
+* Upgrade confidant to python 3.10.14
+
 ## 6.5.8
 
 * Migrated to docker compose v2

Dockerfile

@@ -1,19 +1,19 @@
-FROM ubuntu:bionic
+FROM ubuntu:jammy
 LABEL maintainer="[email protected]"
 
 WORKDIR /srv/confidant
 
 RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         curl ca-certificates \
-    && /usr/bin/curl -sL --fail https://deb.nodesource.com/setup_10.x | bash -
+    && /usr/bin/curl -sL --fail https://deb.nodesource.com/setup_20.x | bash -
 RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         # For frontend
         make nodejs git-core \
         # For backend
         gcc pkg-config \
-        python3.8-dev virtualenv \
+        python3.10-dev virtualenv \
         libffi-dev libxml2-dev libxmlsec1-dev \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
@@ -22,18 +22,17 @@ COPY package.json /srv/confidant/
 RUN npm install grunt-cli && \
     npm install
 
-COPY piptools_requirements.txt piptools_requirements3.txt requirements3.txt /srv/confidant/
+COPY piptools_requirements.txt requirements.txt /srv/confidant/
 
 ENV PATH=/venv/bin:$PATH
-RUN virtualenv /venv --python=/usr/bin/python3.8 && \
+RUN virtualenv /venv --python=/usr/bin/python3.10 && \
     pip install --no-cache -r piptools_requirements.txt && \
-    pip install --no-cache -r piptools_requirements3.txt && \
-    pip install --no-cache -r requirements3.txt
+    pip install --no-cache -r requirements.txt
 
 COPY .jshintrc Gruntfile.js /srv/confidant/
 COPY confidant/public /srv/confidant/confidant/public
 
-RUN node_modules/grunt-cli/bin/grunt build --force
+RUN node_modules/grunt-cli/bin/grunt build
 
 COPY . /srv/confidant
 

Gruntfile.js

@@ -11,6 +11,7 @@ module.exports = function (grunt) {
 
   // Configurable paths for the application
   var appConfig = {
+    baseDir: '',
     nodeDir: 'node_modules',
     app: 'confidant/public',
     components: 'confidant/public/components',
@@ -45,7 +46,7 @@ module.exports = function (grunt) {
     // Make sure code styles are up to par and there are no obvious mistakes
     jshint: {
       options: {
-        jshintrc: '<%= baseDir %>.jshintrc',
+        jshintrc: '.jshintrc',
         reporter: require('jshint-stylish')
       },
       all: {
@@ -67,7 +68,8 @@ module.exports = function (grunt) {
       options: {
         ignorePath: '<%= project.app %>',
         relative: false,
-        destFile:'<%= project.app %>/index.html'
+        destFile:'<%= project.app %>/index.html',
+        lineEnding: '\n',
       },
       scripts: {
         src: [

VERSION

@@ -1 +1 @@
-6.5.8
+6.6.1

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 piptools_requirements3.txt && pip install -r requirements3.txt
+pip install -r piptools_requirements.txt && pip install -r requirements.txt
 make test_integration

confidant/routes/credentials.py

@@ -126,6 +126,7 @@ def get_credential_list():
             for credential in
             Credential.data_type_date_index.query('credential')
         ])
+
     return credentials_response_schema.dumps(credentials_response)
 
 
@@ -257,6 +258,7 @@ def get_credential(id):
         include_credential_pairs=include_credential_pairs,
     )
     credential_response.permissions = permissions
+
     return credential_response_schema.dumps(credential_response)
 
 

confidant/schema/blind_credentials.py

@@ -1,5 +1,4 @@
 import attr
-import toastedmarshmallow
 from marshmallow import fields
 
 from confidant.schema.auto_build_schema import AutobuildSchema
@@ -51,8 +50,6 @@ def from_blind_credential(
 
 
 class BlindCredentialResponseSchema(AutobuildSchema):
-    class Meta:
-        jit = toastedmarshmallow.Jit
 
     _class_to_load = BlindCredentialResponse
 

confidant/schema/certificates.py

@@ -1,5 +1,4 @@
 import attr
-import toastedmarshmallow
 from marshmallow import fields
 
 from confidant.schema.auto_build_schema import AutobuildSchema
@@ -32,8 +31,6 @@ def from_cas(cls, cas):
 
 
 class CertificateAuthorityResponseSchema(AutobuildSchema):
-    class Meta:
-        jit = toastedmarshmallow.Jit
 
     _class_to_load = CertificateAuthorityResponse
 
@@ -44,8 +41,6 @@ class Meta:
 
 
 class CertificateAuthoritiesResponseSchema(AutobuildSchema):
-    class Meta:
-        jit = toastedmarshmallow.Jit
 
     _class_to_load = CertificateAuthoritiesResponse
 
@@ -60,8 +55,6 @@ class CertificateResponse(object):
 
 
 class CertificateResponseSchema(AutobuildSchema):
-    class Meta:
-        jit = toastedmarshmallow.Jit
 
     _class_to_load = CertificateResponse
 
@@ -70,8 +63,6 @@ class Meta:
 
 
 class CertificateExpandedResponseSchema(AutobuildSchema):
-    class Meta:
-        jit = toastedmarshmallow.Jit
 
     _class_to_load = CertificateResponse
 

confidant/schema/credentials.py

@@ -1,5 +1,4 @@
 import attr
-import toastedmarshmallow
 from marshmallow import fields, pre_dump, Schema
 
 from confidant.schema.auto_build_schema import AutobuildSchema
@@ -51,8 +50,6 @@ def from_credential(
 
 
 class CredentialResponseSchema(AutobuildSchema):
-    class Meta:
-        jit = toastedmarshmallow.Jit
 
     _class_to_load = CredentialResponse
 
@@ -99,8 +96,6 @@ def from_credentials(
 
 
 class CredentialsResponseSchema(Schema):
-    class Meta:
-        jit = toastedmarshmallow.Jit
 
     _class_to_load = CredentialsResponse
 
@@ -151,8 +146,6 @@ def from_credentials(
 
 
 class RevisionsResponseSchema(Schema):
-    class Meta:
-        jit = toastedmarshmallow.Jit
 
     _class_to_load = RevisionsResponse
 

confidant/schema/jwks.py

@@ -1,5 +1,4 @@
 import attr
-import toastedmarshmallow
 from marshmallow import fields
 
 from confidant.schema.auto_build_schema import AutobuildSchema
@@ -11,8 +10,6 @@ class JWTResponse(object):
 
 
 class JWTResponseSchema(AutobuildSchema):
-    class Meta:
-        jit = toastedmarshmallow.Jit
 
     _class_to_load = JWTResponse
     token = fields.Str(required=True)
@@ -32,8 +29,6 @@ class JWKSResponse(object):
 
 
 class JWKSResponseSchema(AutobuildSchema):
-    class Meta:
-        jit = toastedmarshmallow.Jit
 
     _class_to_load = JWKSResponse
 
@@ -45,8 +40,6 @@ class Meta:
 
 
 class JWKSListResponseSchema(AutobuildSchema):
-    class Meta:
-        jit = toastedmarshmallow.Jit
 
     _class_to_load = JWKSListResponse
     keys = fields.List(fields.Nested(JWKSResponseSchema))