fix package_dir declaration and typing modules -> packages

python · mvcisback · Aug 10, 2014 · Aug 10, 2014 · Aug 11, 2014 · Aug 12, 2014
commit ebc012f629c817b963a1035ab3f916eb123f864f
diff --git a/lib-typing/2.7/__init__.py b/lib-typing/2.7/__init__.py
diff --git a/lib-typing/2.7/typing.py → lib-typing/2.7/typing/__init__.py b/lib-typing/2.7/typing.py → lib-typing/2.7/typing/__init__.py
diff --git a/lib-typing/2.7/setup.py → lib-typing/2.7/typing/setup.py b/lib-typing/2.7/setup.py → lib-typing/2.7/typing/setup.py
diff --git a/lib-typing/2.7/test_typing.py → lib-typing/2.7/typing/test_typing.py b/lib-typing/2.7/test_typing.py → lib-typing/2.7/typing/test_typing.py
diff --git a/lib-typing/3.2/__init__.py b/lib-typing/3.2/__init__.py
diff --git a/lib-typing/3.2/typing.py → lib-typing/3.2/typing/__init__.py b/lib-typing/3.2/typing.py → lib-typing/3.2/typing/__init__.py
diff --git a/lib-typing/3.2/test_typing.py → lib-typing/3.2/typing/test_typing.py b/lib-typing/3.2/test_typing.py → lib-typing/3.2/typing/test_typing.py
diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 
 from mypy.codec import register
 
-from setuptools import setup
+from setuptools import setup, find_packages
 
 if sys.version_info < (3, 2, 0):
     sys.stderr.write("ERROR: You need Python 3.2 or later to use mypy.\n")
@@ -44,10 +44,10 @@
       url='http://www.mypy-lang.org/',
       license='MIT License',
       platforms=['POSIX'],
-      package_dir={'': 'lib-typing/3.2', 'mypy': 'mypy'},
+      package_dir={'typing': 'lib-typing/3.2/typing', 'mypy': 'mypy'},
       package_data={'mypy': ['stubs/*/*.py', 'lib/*py', 'vm/*']},
       py_modules=['typing'],
-      packages=['mypy'],
+      packages=find_packages(),
       entry_points={
           'console_scripts': ['mypy = mypy.main:main']
       },