diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 75e7067..53d31a6 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -16,14 +16,14 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.8", "3.9", "3.10", "3.11"] + python-version: ["3.10", "3.11", "3.12"] runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - - run: pip install pytest pytest-cov -r requirements.txt + - run: pip install pytest==8.1.2 pytest-cov -r requirements.txt - run: pytest --cov=webssh - run: mkdir -p coverage - uses: tj-actions/coverage-badge-py@v2 diff --git a/requirements.txt b/requirements.txt index 18ee6b3..95419b2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -paramiko==3.0.0 -tornado==6.2.0 +paramiko==3.5.1 +tornado==6.5.1 diff --git a/tests/test_handler.py b/tests/test_handler.py index a9ad924..5eabfa5 100644 --- a/tests/test_handler.py +++ b/tests/test_handler.py @@ -121,7 +121,7 @@ class TestMixinHandler(unittest.TestCase): self.assertEqual(mhandler.get_real_client_addr(), (x_forwarded_for, fake_port)) - mhandler.request.headers.add('X-Forwarded-Port', fake_port + 1) + mhandler.request.headers.add('X-Forwarded-Port', str(fake_port + 1)) self.assertEqual(mhandler.get_real_client_addr(), (x_forwarded_for, fake_port)) @@ -135,7 +135,7 @@ class TestMixinHandler(unittest.TestCase): self.assertEqual(mhandler.get_real_client_addr(), (x_real_ip, fake_port)) - mhandler.request.headers.add('X-Real-Port', fake_port + 1) + mhandler.request.headers.add('X-Real-Port', str(fake_port + 1)) self.assertEqual(mhandler.get_real_client_addr(), (x_real_ip, fake_port)) @@ -336,5 +336,5 @@ class TestIndexHandler(unittest.TestCase): ssh.exec_command.return_value = (stdin, stdout, stderr) encoding = IndexHandler.get_default_encoding(handler, ssh) - self.assertEquals("utf-8", encoding) + self.assertEqual("utf-8", encoding)