Skip to content

Commit

Permalink
Removes test requirements from installation
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin Matyasek committed Apr 15, 2019
1 parent b84528a commit 0efe31e
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ python:
- "3.6"

install:
- make install
- make setup
- pip install coveralls

script:
Expand Down
7 changes: 3 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ clean-build:
rm -rf *.egg-info

setup: clean
python setup.py develop
pip install -U -e .[dev,test]

setup-dev: clean
virtualenv -p python3 venv
./venv/bin/pip install -U pip
./venv/bin/pip install -U setuptools twine bumpversion
./venv/bin/python setup.py develop
./venv/bin/pip install -U setuptools
./venv/bin/pip install -U -e .[dev,test]

install: clean
python setup.py install
Expand All @@ -66,7 +66,6 @@ lint:
tests:
@echo ">>> running tests"
python tests/run.py || ( echo ">>> tests failed"; exit 1; )
# python setup.py test

release-check: type-check flake8-check lint tests

Expand Down
22 changes: 15 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from setuptools import find_packages, setup
from setuptools.dist import Distribution

import ftoolz
from ftoolz import __version__ as ftoolz_version


class BinaryDistribution(Distribution):
Expand All @@ -15,6 +15,15 @@ def has_ext_modules(self) -> bool:
return True


ftoolz_requirements = [
'cytoolz==0.9.0.1',
]

dev_requirements = [
'bumpversion==0.5.3',
'twine==1.13.0',
]

test_requirements = [
# 'astroid==2.2.5',
'astroid==2.1.0',
Expand All @@ -23,19 +32,17 @@ def has_ext_modules(self) -> bool:
# 'mypy==0.700',
'mypy==0.630',
'nose==1.3.7',
# 'nose2==0.8.0',
# 'nose2[coverage_plugin]>=0.6.5',
# 'pylint==2.3.0',
'pylint==2.2.0',
'typed-ast==1.1.1',
]

setup(
name='ftoolz',
version=ftoolz.__version__,
version=ftoolz_version,
description='Collection of higher-order and utility functions',
long_description=(open('README.md').read() if exists('README.md') else ''),
long_description_content_type="text/markdown",
long_description_content_type='text/markdown',
classifiers=[
'Development Status :: 4 - Beta',
'Environment :: Console',
Expand All @@ -56,7 +63,8 @@ def has_ext_modules(self) -> bool:
distclass=BinaryDistribution,
zip_safe=False,
python_requires='>=3.6',
install_requires=['cytoolz==0.9.0.1'] + test_requirements,
install_requires=ftoolz_requirements,
extras_require={'dev': dev_requirements, 'test': test_requirements},
test_suite='tests',
tests_require=test_requirements,
tests_require=ftoolz_requirements + test_requirements,
)

0 comments on commit 0efe31e

Please sign in to comment.