Skip to content

Commit

Permalink
Merge pull request #123 from sarugaku/optional-click
Browse files Browse the repository at this point in the history
Optional click
  • Loading branch information
oz123 authored Aug 17, 2022
2 parents b632697 + 9ae9fb9 commit 004ad92
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 11 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ 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
run: |
python -m pip install "tox<4" tox-gh-actions
python -m pip install "tox<4" tox-gh-actions click
tox
3 changes: 2 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ package_data =
install_requires =
attrs
cached-property
click
six
packaging
backports.functools_lru_cache;python_version=="2.7"
Expand All @@ -56,6 +55,8 @@ exclude =
tasks

[options.extras_require]
cli =
click
tests =
pytest
pytest-cov
Expand Down
1 change: 0 additions & 1 deletion src/pythonfinder/pythonfinder.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import os

import six
from click import secho

from . import environment
from .compat import lru_cache
Expand Down
8 changes: 3 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -40,7 +38,7 @@ commands =
deps =
twine
build
-e .[tests]
-e .[tests,cli]
commands =
python setup.py sdist
twine check dist/*

0 comments on commit 004ad92

Please sign in to comment.