r47108 - fix

Author: hawkowl
Date: Wed Mar 30 11:10:36 2016
New Revision: 47108

Modified:
   branches/src-move-8214-3/.gitignore
   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/tox.ini

Log:
fix

Modified: branches/src-move-8214-3/.gitignore
==============================================================================
--- branches/src-move-8214-3/.gitignore	(original)
+++ branches/src-move-8214-3/.gitignore	Wed Mar 30 11:10:36 2016
@@ -4,6 +4,7 @@
 *.so
 _trial_temp*/
 build/
+.tox/
 dropin.cache
 doc/
 docs/_build/

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:36 2016
@@ -30,12 +30,12 @@
 include setup3.py
 
 # Some tests stuff
-recursive-include twisted *.pem
-include twisted/internet/test/fake_CAs/*
-include twisted/mail/test/rfc822.message
+recursive-include src/twisted *.pem
+include src/twisted/internet/test/fake_CAs/*
+include src/twisted/mail/test/rfc822.message
 
 # Some extras
-recursive-include twisted *.glade *.pxi *.h *.c *.bat *.g *.pyx *.zsh *.txt
+recursive-include src/twisted *.glade *.pxi *.h *.c *.bat *.g *.pyx *.zsh *.txt
 
 # Docs
 include docs/fun/lightbulb

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:36 2016
@@ -28,8 +28,8 @@
         setup3.main()
         return
 
-    if os.path.exists('twisted'):
-        sys.path.insert(0, '.')
+    if os.path.exists('src/twisted/'):
+        sys.path.insert(0, 'src')
 
     requirements = ["zope.interface >= 3.6.0"]
 
@@ -47,6 +47,7 @@
         include_package_data=True,
         zip_safe=False,
         extras_require=_EXTRAS_REQUIRE,
+        package_dir={"": "src"},
     ))
 
     setup(**setup_args)

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:36 2016
@@ -49,8 +49,8 @@
 def main():
     # Make sure the to-be-installed version of Twisted is used, if available,
     # since we're importing from it:
-    if os.path.exists('twisted'):
-        sys.path.insert(0, '.')
+    if os.path.exists('src/twisted'):
+        sys.path.insert(0, 'src')
 
     from twisted.python.dist import STATIC_PACKAGE_METADATA, getScripts
 
@@ -65,6 +65,7 @@
         zip_safe=False,
         include_package_data=True,
         scripts=getScripts(),
+        package_dir={"": "src"},
     ))
 
     setup(**args)

Modified: branches/src-move-8214-3/tox.ini
==============================================================================
--- branches/src-move-8214-3/tox.ini	(original)
+++ branches/src-move-8214-3/tox.ini	Wed Mar 30 11:10:36 2016
@@ -2,14 +2,12 @@
 
 [tox]
 skip_missing_interpreters=True
-toxworkdir=build/
 envlist=
         {py27,py33,py34,py35}-{tests,nomodules,coverage}-posix
         py27-{tests,nomodules,coverage}-windows,
         pyflakes,twistedchecker,apidocs,narrativedocs
 
 [testenv]
-changedir={envtmpdir}
 deps =
      ; zope.interface is love, zope.interface is life
      zope.interface