Merge pull request #8 from tk0miya/extra_requirements

Update extras_require
blockdiag · Jan 13, 2020 · 3814581 · 3814581
2 parents 8688153 + 9c0ad34
commit 3814581
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 18 deletions.
diff --git a/setup.py b/setup.py
@@ -19,13 +19,6 @@
  "Topic :: Text Processing :: Markup",
 ]
 
-requires = ['blockdiag>=1.5.0']
-test_requires = ['nose',
- 'pep8>=1.3',
- 'reportlab',
- 'docutils']
-
-
 setup(
  name='actdiag',
  version=actdiag.__version__,
@@ -44,15 +37,22 @@
  package_data={'': ['buildout.cfg']},
  include_package_data=True,
  python_requires=">=3.5",
- install_requires=requires,
+ install_requires=['blockdiag >= 1.5.0'],
  extras_require=dict(
- testing=test_requires,
  rst=[
  'docutils',
  ],
+ testing=[
+ 'nose',
+ 'pep8 >=1.3',
+ 'reportlab',
+ 'docutils',
+ 'flake8',
+ 'flake8-coding',
+ 'flake8-copyright',
+ ],
  ),
  test_suite='nose.collector',
- tests_require=test_requires,
  entry_points="""
  [console_scripts]
  actdiag = actdiag.command:main

diff --git a/tox.ini b/tox.ini
@@ -2,13 +2,9 @@
 envlist=py35,py36,py37,py38,blockdiag_dev
 
 [testenv]
-deps=
- nose
- flake8
- flake8-coding
- flake8-copyright
- docutils
- reportlab
+usedevelop = True
+extras =
+ testing
 passenv=
  ALL_TESTS
 commands=
@@ -26,5 +22,4 @@ deps=
 
 [testenv:blockdiag_dev]
 deps=
- {[testenv]deps}
  git+https://github.com/blockdiag/blockdiag