diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 26008d2..5f161b4 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -8,21 +8,13 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] + python-version: ["3.8", "3.9", "3.10", "3.11"] steps: - uses: actions/checkout@v1 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - name: Run Tox on 3.7 - run: | - cd server - pip install tox - tox - env: - TOXENV: py37-buildout_2_9_2,py37-buildout_current - if: matrix.python-version == '3.7' - name: Run Tox on 3.8 run: | cd server diff --git a/server/README.md b/server/README.md index d9e1083..e328ed8 100644 --- a/server/README.md +++ b/server/README.md @@ -6,7 +6,7 @@ This language server is implemented using [pygls](https://github.com/openlawlibr ## Standalone -Needs a python >= 3.7. +Needs a python >= 3.8. ```bash python -m pip install zc.buildout.languageserver diff --git a/server/buildoutls/tests/conftest.py b/server/buildoutls/tests/conftest.py index 375b39f..a3fbf5e 100644 --- a/server/buildoutls/tests/conftest.py +++ b/server/buildoutls/tests/conftest.py @@ -3,11 +3,7 @@ import os import urllib.parse from typing import Any -import sys -if sys.version_info < (3, 8): - import mock -else: - from unittest import mock +from unittest import mock import pytest import aioresponses diff --git a/server/setup.py b/server/setup.py index dcdf3b2..909365a 100644 --- a/server/setup.py +++ b/server/setup.py @@ -28,7 +28,7 @@ ], keywords='zc.buildout languageserver', packages=['buildoutls'], - python_requires='>=3.7', + python_requires='>=3.8', install_requires=[ 'aiohttp', 'cachetools', @@ -40,9 +40,7 @@ extras_require={ 'test': [ 'aioresponses', - 'asynctest; python_version < "3.8"', 'coverage', - 'mock; python_version < "3.8"', 'mypy', 'pylint', 'pytest-asyncio', @@ -50,7 +48,6 @@ 'pytest-cov', 'pytest', 'types-cachetools', - 'types-mock; python_version < "3.8"', 'types-setuptools', 'types-toml', 'yapf', diff --git a/server/tox.ini b/server/tox.ini index fe54248..525dcf1 100644 --- a/server/tox.ini +++ b/server/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{37,38,39,310,311}-buildout_{2_9_2,current} +envlist = py{38,39,310,311}-buildout_{2_9_2,current} [testenv] extras =