r47109 - before-src-move parity

Author: hawkowl
Date: Wed Mar 30 11:10:54 2016
New Revision: 47109

Modified:
   branches/src-move-8214-3/MANIFEST.in
   branches/src-move-8214-3/setup.py
   branches/src-move-8214-3/setup3.py
   branches/src-move-8214-3/twisted/python/dist.py

Log:
before-src-move parity

Modified: branches/src-move-8214-3/MANIFEST.in
==============================================================================
--- branches/src-move-8214-3/MANIFEST.in	(original)
+++ branches/src-move-8214-3/MANIFEST.in	Wed Mar 30 11:10:54 2016
@@ -8,9 +8,9 @@
 #  - Things only useful when running from a source checkout (_preamble.py)
 
 # Do not include the old topfiles, or news fragments
-recursive-exclude twisted *.misc *.bugfix *.doc *.feature *.removal
-recursive-exclude twisted NEWS README topfiles
-exclude twisted/topfiles/CREDITS twisted/topfiles/ChangeLog.Old
+recursive-exclude src/twisted *.misc *.bugfix *.doc *.feature *.removal
+recursive-exclude src/twisted NEWS README topfiles
+exclude src/twisted/topfiles/CREDITS src/twisted/topfiles/ChangeLog.Old
 
 # Include NEWS, READMEs, etc
 recursive-include docs README

Modified: branches/src-move-8214-3/setup.py
==============================================================================
--- branches/src-move-8214-3/setup.py	(original)
+++ branches/src-move-8214-3/setup.py	Wed Mar 30 11:10:54 2016
@@ -40,7 +40,7 @@
     setup_args = STATIC_PACKAGE_METADATA.copy()
 
     setup_args.update(dict(
-        packages=setuptools.find_packages(),
+        packages=setuptools.find_packages("src"),
         install_requires=requirements,
         conditionalExtensions=getExtensions(),
         scripts=getScripts(),

Modified: branches/src-move-8214-3/setup3.py
==============================================================================
--- branches/src-move-8214-3/setup3.py	(original)
+++ branches/src-move-8214-3/setup3.py	Wed Mar 30 11:10:54 2016
@@ -60,7 +60,7 @@
             'build_py': PickyBuildPy,
             'build_scripts': PickyBuildScripts,
         },
-        packages=find_packages(),
+        packages=find_packages("src"),
         install_requires=["zope.interface >= 4.0.2"],
         zip_safe=False,
         include_package_data=True,

Modified: branches/src-move-8214-3/twisted/python/dist.py
==============================================================================
--- branches/src-move-8214-3/twisted/python/dist.py	(original)
+++ branches/src-move-8214-3/twisted/python/dist.py	Wed Mar 30 11:10:54 2016
@@ -57,6 +57,7 @@
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.3",
         "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
         ],
     )
 
@@ -180,24 +181,24 @@
     extensions = [
         ConditionalExtension(
             "twisted.test.raiser",
-            ["twisted/test/raiser.c"],
+            ["src/twisted/test/raiser.c"],
             condition=lambda _: _isCPython),
 
         ConditionalExtension(
             "twisted.internet.iocpreactor.iocpsupport",
-            ["twisted/internet/iocpreactor/iocpsupport/iocpsupport.c",
-             "twisted/internet/iocpreactor/iocpsupport/winsock_pointers.c"],
+            ["src/twisted/internet/iocpreactor/iocpsupport/iocpsupport.c",
+             "src/twisted/internet/iocpreactor/iocpsupport/winsock_pointers.c"],
             libraries=["ws2_32"],
             condition=lambda _: _isCPython and sys.platform == "win32"),
 
         ConditionalExtension(
             "twisted.python._sendmsg",
-            sources=["twisted/python/_sendmsg.c"],
+            sources=["src/twisted/python/_sendmsg.c"],
             condition=lambda _: sys.platform != "win32"),
 
         ConditionalExtension(
             "twisted.runner.portmap",
-            ["twisted/runner/portmap.c"],
+            ["src/twisted/runner/portmap.c"],
             condition=lambda builder: builder._check_header("rpc/rpc.h")),
     ]