diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ffbc21b..5cd80c7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,34 +12,22 @@ jobs: matrix: include: # linux - - os: ubuntu-latest - python: 3.6 - toxenv: py - os: ubuntu-latest python: 3.7 - toxenv: py - os: ubuntu-latest python: 3.8 - toxenv: py - os: ubuntu-latest python: 3.9 - toxenv: py - os: ubuntu-latest - python: '3.10.0' - toxenv: py + python: '3.10' # windows - os: windows-latest - python: 3.6 - toxenv: py - # misc - - os: ubuntu-latest - python: 3.9 - toxenv: pre-commit + python: 3.7 runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 with: python-version: ${{ matrix.python }} - run: python -mpip install --upgrade setuptools pip tox virtualenv - - run: tox -e ${{ matrix.toxenv }} + - run: tox -e py diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 34c41f9..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,30 +0,0 @@ -before_script: -- pip install tox - -pypy27: - image: pypy:2.7 - script: tox -e pypy - -pypy36: - image: pypy:3.6 - script: tox -e pypy3 - -python27: - image: python:2.7 - script: tox -e py27 - -python35: - image: python:3.5 - script: tox -e py35 - -python36: - image: python:3.6 - script: tox -e py36 - -python37: - image: python:3.7 - script: tox -e py37 - -python38: - image: python:3.8 - script: tox -e py38 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2d95f49..b7d9895 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -11,7 +11,7 @@ repos: rev: v3.9.0 hooks: - id: reorder-python-imports - args: [--application-directories, '.:src', --py36-plus] + args: [--application-directories, '.:src', --py37-plus] - repo: https://github.com/psf/black rev: 22.10.0 hooks: @@ -21,9 +21,9 @@ repos: rev: v3.3.0 hooks: - id: pyupgrade - args: [--py36-plus] + args: [--py37-plus] - repo: https://github.com/asottile/setup-cfg-fmt rev: v2.2.0 hooks: - id: setup-cfg-fmt - args: [--min-py3-version, '3.6'] + args: [--min-py3-version, '3.7'] diff --git a/setup.cfg b/setup.cfg index 0d9e50e..e838077 100644 --- a/setup.cfg +++ b/setup.cfg @@ -27,7 +27,7 @@ py_modules = flake8_docstrings install_requires = flake8>=3 pydocstyle>=2.1 -python_requires = >=3.6 +python_requires = >=3.7 [options.entry_points] flake8.extension = diff --git a/tox.ini b/tox.ini index 5dbeaeb..5e4cc71 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 1.6 -envlist = pre-commit,py36,py37,py38,py39,py310 +envlist = pre-commit,py [testenv] deps =