Skip to content

Commit

Permalink
Merge pull request #163 from termius/dependabot/pip/cryptography-3.2
Browse files Browse the repository at this point in the history
[Security] Bump cryptography to 3.2
  • Loading branch information
Ivan Kudinov authored Dec 8, 2020
2 parents 234d010 + 1ecd4e7 commit 17cf5fb
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 4 deletions.
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@
'cliff==2.7.0',
'stevedore>=1.10.0',
'requests>=2.7.0',
'cryptography>=1.3.1; python_version >= "3.6"',
'cryptography==3.0; python_version == "3.5"',
'cryptography==2.9; python_version == "2.7"',
'cryptography>=3.2; python_version >= "3.6"',
'cryptography==3.2; python_version == "3.5" or python_version == "2.7"',
'six>=1.10.0',
'ndg-httpsclient>=0.4.0',
'pyopenssl>=0.15.1; python_version >= "3.6"',
Expand Down
14 changes: 14 additions & 0 deletions termius/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,23 @@
# -*- coding: utf-8 -*-
"""Entrypoint for CLI tool."""
import sys
import os
import warnings
from termius.app import TermiusApp


if os.getenv('TERMIUS_CLI_DEBUG'):
warnings.filterwarnings(
'ignore', r'Python 2 is no longer supported by the Python core team. ',
UserWarning, r'termius'
)
warnings.filterwarnings(
'ignore', (r'Python 3.5 support will be dropped '
'in the next release of cryptography.'),
UserWarning, r'termius'
)


def main(argv=None):
"""Process call from terminal."""
app = TermiusApp()
Expand Down
4 changes: 3 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# and then run "tox" from this directory.

[tox]
envlist = py27,py35
envlist = py27,py36
skipsdist = True

[testenv]
Expand All @@ -15,6 +15,8 @@ commands =
paver completion_tests
paver bats
passenv = SERVERAUDITOR_USERNAME SERVERAUDITOR_PASSWORD
setenv =
TERMIUS_CLI_DEBUG = 1

[flake8]
exclude = .git*
Expand Down

0 comments on commit 17cf5fb

Please sign in to comment.