Skip to content

Commit e9fd498

Browse files
Merge pull request #434 from Flushot/flushot/tika-deprecation-warnings
Implicit namespace packages
2 parents 9aca0ff + ac6e002 commit e9fd498

3 files changed

Lines changed: 4 additions & 28 deletions

File tree

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
.DS_Store
1111
/setup.cfg
1212
.idea
13-
13+
__pycache__/

setup.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,7 @@
3030
except ImportError:
3131
pass
3232

33-
try:
34-
from setuptools import setup, find_packages
35-
except ImportError:
36-
from distutils.core import setup, find_packages
33+
from setuptools import setup, find_packages, find_namespace_packages
3734

3835
version = tika.__version__
3936

@@ -87,7 +84,7 @@ def read(*rnames):
8784
url='http://github.com/chrismattmann/tika-python',
8885
download_url='http://github.com/chrismattmann/tika-python',
8986
license='Apache License version 2 ("ALv2")',
90-
packages=find_packages(exclude=['ez_setup']),
87+
packages=find_packages(exclude=['ez_setup']) + find_namespace_packages(include=['tika.tests']),
9188
include_package_data=True,
9289
zip_safe=True,
9390
test_suite='tika.tests',
@@ -101,7 +98,7 @@ def read(*rnames):
10198
# for the package
10299
},
103100
install_requires=[
104-
'setuptools',
101+
'setuptools>=40.1',
105102
'requests'
106103
],
107104
extras_require=extras_require,

tika/tests/__init__.py

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)