1
0
mirror of https://github.com/nvbn/thefuck.git synced 2025-01-31 18:21:10 +00:00

Merge branch 'petr-tichy-master'

This commit is contained in:
nvbn 2015-07-18 17:19:57 +03:00
commit fbfb4b5e41
3 changed files with 5 additions and 5 deletions

View File

@ -4,6 +4,6 @@ python:
- "3.3" - "3.3"
- "2.7" - "2.7"
install: install:
- python setup.py develop
- pip install -r requirements.txt - pip install -r requirements.txt
- python setup.py develop
script: py.test -v script: py.test -v

View File

@ -2,3 +2,4 @@ pytest
mock mock
pytest-mock pytest-mock
wheel wheel
setuptools>=17.1

View File

@ -11,12 +11,10 @@ elif (3, 0) < sys.version_info < (3, 3):
' ({}.{} detected).'.format(*sys.version_info[:2])) ' ({}.{} detected).'.format(*sys.version_info[:2]))
sys.exit(-1) sys.exit(-1)
VERSION = '1.49' VERSION = '1.49.1'
install_requires = ['psutil', 'colorama', 'six'] install_requires = ['psutil', 'colorama', 'six']
extras_require = {':python_version<"3.4"': ['pathlib']}
if sys.version_info < (3, 4):
install_requires.append('pathlib')
setup(name='thefuck', setup(name='thefuck',
version=VERSION, version=VERSION,
@ -30,6 +28,7 @@ setup(name='thefuck',
include_package_data=True, include_package_data=True,
zip_safe=False, zip_safe=False,
install_requires=install_requires, install_requires=install_requires,
extras_require=extras_require,
entry_points={'console_scripts': [ entry_points={'console_scripts': [
'thefuck = thefuck.main:main', 'thefuck = thefuck.main:main',
'thefuck-alias = thefuck.shells:app_alias']}) 'thefuck-alias = thefuck.shells:app_alias']})