diff options
| author | adehad <26027314+adehad@users.noreply.github.com> | 2021-10-21 19:04:16 +0100 |
|---|---|---|
| committer | adehad <26027314+adehad@users.noreply.github.com> | 2021-10-21 19:08:11 +0100 |
| commit | a8f8635f002fef32f35852a9dc2ede1b9732d731 (patch) | |
| tree | 75b3dff0254c0cebee66defd9f7e791c79fabf1e | |
| parent | bdba8b461e345255f6f5bd1654c9e813b1b913bf (diff) | |
| download | tftpy-a8f8635f002fef32f35852a9dc2ede1b9732d731.tar.gz | |
update after py27 support dropped
| -rw-r--r-- | .github/workflows/test.yml | 5 | ||||
| -rw-r--r-- | .pre-commit-config.yaml | 5 | ||||
| -rw-r--r-- | pyproject.toml | 2 | ||||
| -rwxr-xr-x | setup.py | 5 | ||||
| -rw-r--r-- | tox.ini | 5 |
5 files changed, 10 insertions, 12 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0e09f40..87e5222 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,7 +18,7 @@ jobs: strategy: matrix: os: [Ubuntu] - python-version: [2.7, 3.6, 3.7, 3.8] + python-version: [3.6, 3.7, 3.8] steps: - uses: actions/checkout@master @@ -35,15 +35,12 @@ jobs: - name: Lint with tox run: tox -e lint - if: ${{ startsWith(matrix.python-version,'3') }} - name: Test with tox run: tox - name: Run tox pkg run: tox -e pkg - if: ${{ startsWith(matrix.python-version,'3') }} - name: Make docs run: tox -e docs - if: ${{ startsWith(matrix.python-version,'3') }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 11cbed5..6fb9153 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -36,6 +36,11 @@ repos: # rev: 3.9.2 # hooks: # - id: flake8 + # - repo: https://github.com/asottile/pyupgrade + # rev: v2.29.0 + # hooks: + # - id: pyupgrade + # args: [ --py36-plus ] - repo: https://github.com/pycqa/isort rev: 5.9.1 hooks: diff --git a/pyproject.toml b/pyproject.toml index f7a4f50..5f247e2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["setuptools", "wheel", "setuptools_scm[toml]<6.0"] # <6 for py27 support +requires = ["setuptools", "wheel", "setuptools_scm[toml]"] build-backend = "setuptools.build_meta" @@ -30,12 +30,11 @@ if __name__ == "__main__": "Tracker": "https://github.com/msoulier/tftpy/issues", }, setup_requires=[ - "setuptools_scm[toml] < 6.0", # <6.0 for py27 support + "setuptools_scm[toml]", "setuptools_scm_git_archive >= 1.0", ], - python_requires=">=2.7", + python_requires=">=3.6", classifiers=[ - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", "Development Status :: 4 - Beta", "Environment :: Console", @@ -1,7 +1,6 @@ [tox] minversion = 3.8.0 envlist = - py27 py36 py37 py38 @@ -34,9 +33,7 @@ deps = commands = git clean -xdf dist python setup.py check -m -s - python setup.py bdist_wheel --universal - # --universal for Py27 compatible, see below for preferred - # python -m build --wheel --sdist . + python -m build --wheel --sdist . python -m twine check dist/* usedevelop = false |