From 40c230252392efdfb4322e66bf4e80798f79de2a Mon Sep 17 00:00:00 2001 From: Oz N Tiram Date: Mon, 15 Aug 2022 22:54:56 +0200 Subject: [PATCH 1/5] Click is only used in __main__.py --- setup.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index e8097e8..b69ff82 100644 --- a/setup.cfg +++ b/setup.cfg @@ -42,7 +42,6 @@ package_data = install_requires = attrs cached-property - click six packaging backports.functools_lru_cache;python_version=="2.7" @@ -56,6 +55,8 @@ exclude = tasks [options.extras_require] +cli = + click tests = pytest pytest-cov From 9cc72fb1c04311412d876bf91daa7adfa8fad92d Mon Sep 17 00:00:00 2001 From: Oz N Tiram Date: Mon, 15 Aug 2022 22:55:34 +0200 Subject: [PATCH 2/5] Remove unused import --- src/pythonfinder/pythonfinder.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pythonfinder/pythonfinder.py b/src/pythonfinder/pythonfinder.py index cfbadce..668cd72 100644 --- a/src/pythonfinder/pythonfinder.py +++ b/src/pythonfinder/pythonfinder.py @@ -6,7 +6,6 @@ import os import six -from click import secho from . import environment from .compat import lru_cache From 293d050961e0c4bb27fead15d778100e73e091af Mon Sep 17 00:00:00 2001 From: Oz N Tiram Date: Mon, 15 Aug 2022 23:12:58 +0200 Subject: [PATCH 3/5] Update github workflows --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1a98768..0393c7b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,14 +13,14 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [2.7, 3.6, 3.8, 3.9, "3.10"] + python-version: [3.7, 3.8, 3.9, "3.10"] os: [ubuntu-latest, macOS-latest, windows-latest] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Run Tests From 942b5da77023c73cc4536d7edb9658c9ff058588 Mon Sep 17 00:00:00 2001 From: Oz N Tiram Date: Mon, 15 Aug 2022 23:17:25 +0200 Subject: [PATCH 4/5] Install click for running the tests --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0393c7b..1e42fa5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,5 +25,5 @@ jobs: python-version: ${{ matrix.python-version }} - name: Run Tests run: | - python -m pip install "tox<4" tox-gh-actions + python -m pip install "tox<4" tox-gh-actions click tox From 9ae9fb9d0e088fc155a8fdbdcc49dbb9ba5c607e Mon Sep 17 00:00:00 2001 From: Oz N Tiram Date: Mon, 15 Aug 2022 23:19:15 +0200 Subject: [PATCH 5/5] Install cli deps with tox --- tox.ini | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tox.ini b/tox.ini index ede4907..10f7124 100644 --- a/tox.ini +++ b/tox.ini @@ -1,11 +1,9 @@ [tox] envlist = - docs, packaging, py27, py36, py37, py38, py39, py310, coverage-report + docs, packaging, py37, py38, py39, py310, coverage-report [gh-actions] python = - 2.7: py27 - 3.6: py36 3.7: py37 3.8: py38 3.9: py39 @@ -16,7 +14,7 @@ passenv = CI GIT_SSL_CAINFO setenv = LC_ALL = en_US.UTF-8 deps = - -e .[tests] + -e .[tests,cli] commands = coverage run -m pytest install_command = python -m pip install {opts} {packages} --upgrade-strategy=eager usedevelop = True @@ -40,7 +38,7 @@ commands = deps = twine build - -e .[tests] + -e .[tests,cli] commands = python setup.py sdist twine check dist/*