Skip to content
This repository was archived by the owner on Jul 8, 2020. It is now read-only.

Commit 33c2116

Browse files
authored
Merge pull request #16 from ImageMarkup/tox-settings
Update Tox usage
2 parents b4bdf13 + fe719d9 commit 33c2116

File tree

4 files changed

+14
-4
lines changed

4 files changed

+14
-4
lines changed

pyproject.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[tool.black]
2+
line-length = 100
3+
skip-string-normalization = true
4+
target-version = ['py36']

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
description='Girder plugin for a Discourse Single-Sign-On provider.',
77
url='https://github.com/ImageMarkup/isic-discourse-sso',
88
license='Apache 2.0',
9-
packages=find_packages(exclude=['test']),
9+
packages=find_packages(exclude=['tests']),
1010
python_requires='>=3.6',
1111
install_requires=['girder>=3.0.0a2'],
1212
entry_points={'girder.plugin': ['isic_discourse_sso = isic_discourse_sso:DiscourseSSO']},
File renamed without changes.

tox.ini

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,32 @@ envlist = py36, lint
55
deps =
66
pytest
77
pytest-girder>=3.0.0a5
8-
commands = pytest --verbose --showlocals {posargs} test
8+
commands =
9+
pytest --showlocals {posargs}
910

1011
[testenv:format]
1112
basepython = python3
13+
skipsdist = true
1214
skip_install = true
1315
deps =
1416
black
15-
commands = black --skip-string-normalization --line-length 100 setup.py isic_discourse_sso test
17+
commands =
18+
black setup.py isic_discourse_sso tests
1619

1720
[testenv:lint]
1821
basepython = python3
22+
skipsdist = true
1923
skip_install = true
2024
deps =
25+
black
2126
flake8
2227
flake8-blind-except
2328
flake8-docstrings>=1.3
2429
flake8-import-order>=0.9
2530
pep8-naming
2631
commands =
27-
flake8 setup.py isic_discourse_sso test
32+
flake8 setup.py isic_discourse_sso tests
33+
black --check setup.py isic_discourse_sso tests
2834

2935
[flake8]
3036
max-line-length = 100

0 commit comments

Comments
 (0)