diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index ed69e092..86da400b 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -5,14 +5,14 @@ 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 - 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-20.04 + runs-on: ubuntu-22.04 strategy: matrix: - python-version: ['3.7.x', '3.8.x'] + python-version: ['3.8.x', '3.10.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 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: diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 06be3779..0b813533 100644 --- a/.github/workflows/push.yml +++ b/.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 - 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 - name: Add wheel dependency run: pip install wheel - name: Generate dist diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9f67dbc0..fdcf3cb6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -13,7 +13,7 @@ repos: - id: mypy additional_dependencies: - --no-compile - - cffi==1.14.6 + - cffi==1.16.0 - cryptography==41.0.1 - pycparser==2.21 - types-pyopenssl==23.2.0.1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a774729..e7bb2b9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # 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 diff --git a/Dockerfile b/Dockerfile index b8648f26..a6da0e23 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ RUN apt-get update \ 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,13 +22,12 @@ 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/python10 && \ 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 diff --git a/VERSION b/VERSION index 32c568ae..54c95af1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.5.6 +6.5.7 diff --git a/actions_run_integration.sh b/actions_run_integration.sh index 8aa42da6..183423fc 100755 --- a/actions_run_integration.sh +++ b/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 diff --git a/docker-compose.integration.yml b/docker-compose.integration.yml index b5213673..03628040 100644 --- a/docker-compose.integration.yml +++ b/docker-compose.integration.yml @@ -1,7 +1,7 @@ version: "3.8" services: confidant: - image: python:3.8 + image: python:3.10 init: true restart: "no" networks: diff --git a/docker-compose.yml b/docker-compose.yml index 1babac0f..3b963335 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3.7" +version: "3.8" networks: confidant: name: confidant diff --git a/docs/build.sh b/docs/build.sh index 46827e64..78a6b0ee 100755 --- a/docs/build.sh +++ b/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.8 + virtualenv "${VENV_DIR}"/venv --python=python3.10 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}"/requirements3.txt +pip install -r "${SCRIPT_DIR}"/requirements.txt rsync -av "${SCRIPT_DIR}"/root/ "${SCRIPT_DIR}"/conf.py "${GENERATED_RST_DIR}" diff --git a/docs/requirements3.txt b/docs/requirements3.txt index 6299a1f0..fe6bb11c 100644 --- a/docs/requirements3.txt +++ b/docs/requirements3.txt @@ -1,4 +1,4 @@ --r ../requirements3.txt +-r ../requirements.txt GitPython==2.0.8 Jinja2==2.11.3 Pygments==2.7.4 diff --git a/piptools_requirements.txt b/piptools_requirements.txt index bc733c2d..51301b50 100644 --- a/piptools_requirements.txt +++ b/piptools_requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.10 # by the following command: # # cd ~/src/confidant && run-piptools diff --git a/piptools_requirements3.txt b/piptools_requirements3.txt deleted file mode 100644 index bc733c2d..00000000 --- a/piptools_requirements3.txt +++ /dev/null @@ -1,11 +0,0 @@ -# -# 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 diff --git a/requirements.in b/requirements.in index 90712173..f5fe3b33 100644 --- a/requirements.in +++ b/requirements.in @@ -1,4 +1,4 @@ -# piptools: python3.8 +# piptools: python3.10 # 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.10.0,<1.15.0 +cffi>1.15.0 # License: BSD # Upstream url: https://github.com/fengsp/flask-session diff --git a/requirements.txt b/requirements.txt index ee296dda..d9adfc39 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.10 # 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.14.6 +cffi==1.16.0 # via # -r requirements.in # cryptography diff --git a/requirements3.txt b/requirements3.txt deleted file mode 100644 index ee296dda..00000000 --- a/requirements3.txt +++ /dev/null @@ -1,215 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.8 -# by the following command: -# -# cd ~/src/confidant && run-piptools -# -async-timeout==4.0.2 - # via redis -attrs==23.1.0 - # via toastedmarshmallow -authomatic==1.2.1 - # via -r requirements.in -blinker==1.6.2 - # via -r requirements.in -boto3==1.9.227 - # via - # -r requirements.in - # kmsauth -botocore==1.12.227 - # via - # -r requirements.in - # boto3 - # pynamodb - # s3transfer -cachetools==5.2.0 - # via -r requirements.in -cerberus==1.3.4 - # via -r requirements.in -certifi==2023.5.7 - # via requests -cffi==1.14.6 - # via - # -r requirements.in - # cryptography -charset-normalizer==3.1.0 - # via requests -click==7.1.2 - # via flask -coverage[toml]==7.2.7 - # via pytest-cov -cryptography==41.0.1 - # via - # -r requirements.in - # jwcrypto - # pyopenssl - # types-pyopenssl - # types-redis -deprecated==1.2.14 - # via jwcrypto -docutils==0.15.2 - # via botocore -exceptiongroup==1.1.1 - # via pytest -fakeredis==2.17.0 - # via -r requirements.in -flask==1.1.4 - # via - # -r requirements.in - # flask-script - # flask-session - # flask-sslify -flask-script==2.0.5 - # via -r requirements.in -flask-session==0.2.3 - # via -r requirements.in -flask-sslify==0.1.5 - # via -r requirements.in -gevent==22.10.2 - # via - # -r requirements.in - # pytest-gevent -greenlet==2.0.2 - # via - # -r requirements.in - # gevent -guard==1.0.1 - # via -r requirements.in -gunicorn==20.1.0 - # via -r requirements.in -idna==3.4 - # via requests -iniconfig==2.0.0 - # via pytest -isodate==0.6.1 - # via python3-saml -itsdangerous==1.1.0 - # via flask -jinja2==2.11.3 - # via flask -jmespath==0.10.0 - # via - # boto3 - # botocore -jwcrypto==1.5.0 - # via -r requirements.in -kmsauth==0.6.3 - # via -r requirements.in -lru-dict==1.2.0 - # via -r requirements.in -lxml==4.9.2 - # via - # python3-saml - # xmlsec -markupsafe==2.0.1 - # via jinja2 -mypy==1.4.1 - # via -r requirements.in -mypy-extensions==1.0.0 - # via mypy -ndg-httpsclient==0.5.1 - # via -r requirements.in -packaging==23.1 - # via pytest -pluggy==1.2.0 - # via pytest -pyasn1==0.5.0 - # via - # -r requirements.in - # ndg-httpsclient -pycparser==2.21 - # via cffi -pyjwt==2.7.0 - # via -r requirements.in -pynamodb==5.5.1 - # via -r requirements.in -pyopenssl==23.2.0 - # via - # -r requirements.in - # ndg-httpsclient -pytest==7.4.0 - # via - # -r requirements.in - # pytest-cov - # pytest-env - # pytest-gevent - # pytest-lazy-fixture - # pytest-mock -pytest-cov==4.1.0 - # via -r requirements.in -pytest-env==0.8.2 - # via -r requirements.in -pytest-gevent==1.1.0 - # via -r requirements.in -pytest-lazy-fixture==0.6.3 - # via -r requirements.in -pytest-mock==3.11.1 - # via -r requirements.in -python-dateutil==2.8.2 - # via botocore -python-json-logger==2.0.7 - # via -r requirements.in -python3-saml==1.15.0 - # via -r requirements.in -pytz==2023.3 - # via -r requirements.in -pyyaml==6.0 - # via -r requirements.in -redis==4.6.0 - # via - # -r requirements.in - # fakeredis -requests==2.31.0 - # via -r requirements.in -s3transfer==0.2.1 - # via boto3 -six==1.16.0 - # via - # isodate - # python-dateutil -sortedcontainers==2.4.0 - # via fakeredis -statsd==4.0.1 - # via -r requirements.in -toastedmarshmallow==2.15.2.post1 - # via -r requirements.in -tomli==2.0.1 - # via - # coverage - # mypy - # pytest -types-pyopenssl==23.2.0.1 - # via types-redis -types-pytz==2023.3.0.0 - # via -r requirements.in -types-pyyaml==6.0.12.10 - # via -r requirements.in -types-redis==4.6.0.0 - # via -r requirements.in -typing-extensions==4.7.0 - # via mypy -urllib3==1.25.11 - # via - # botocore - # requests -werkzeug==1.0.1 - # via flask -wrapt==1.15.0 - # via deprecated -xmlsec==1.3.13 - # via python3-saml -zope-event==5.0 - # via gevent -zope-interface==6.0 - # via gevent - -pip==23.1.2 - # via -r piptools_requirements.txt -setuptools==68.0.0 - # via - # -r piptools_requirements.txt - # cerberus - # gevent - # gunicorn - # zope-event - # zope-interface