Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
.DS_Store
/setup.cfg
.idea

__pycache__/
9 changes: 3 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@
except ImportError:
pass

try:
from setuptools import setup, find_packages
except ImportError:
from distutils.core import setup, find_packages
from setuptools import setup, find_packages, find_namespace_packages

version = tika.__version__

Expand Down Expand Up @@ -87,7 +84,7 @@ def read(*rnames):
url='http://github.com/chrismattmann/tika-python',
download_url='http://github.com/chrismattmann/tika-python',
license='Apache License version 2 ("ALv2")',
packages=find_packages(exclude=['ez_setup']),
packages=find_packages(exclude=['ez_setup']) + find_namespace_packages(include=['tika.tests']),
include_package_data=True,
zip_safe=True,
test_suite='tika.tests',
Expand All @@ -101,7 +98,7 @@ def read(*rnames):
# for the package
},
install_requires=[
'setuptools',
'setuptools>=40.1',
'requests'
],
extras_require=extras_require,
Expand Down
21 changes: 0 additions & 21 deletions tika/tests/__init__.py

This file was deleted.