r46899 - things seem to work now

Author: hawkowl
Date: Thu Mar  3 09:40:11 2016
New Revision: 46899

Modified:
   branches/sdist-use-7985-3/setup3.py
   branches/sdist-use-7985-3/tox.ini

Log:
things seem to work now

Modified: branches/sdist-use-7985-3/setup3.py
==============================================================================
--- branches/sdist-use-7985-3/setup3.py	(original)
+++ branches/sdist-use-7985-3/setup3.py	Thu Mar  3 09:40:11 2016
@@ -34,14 +34,13 @@
         sys.path.insert(0, '.')
 
     from twisted.python.dist3 import modulesToInstall, testDataFiles
-    from twisted.python.dist import STATIC_PACKAGE_METADATA, getDataFiles
+    from twisted.python.dist import STATIC_PACKAGE_METADATA
 
     args = STATIC_PACKAGE_METADATA.copy()
     args['install_requires'] = ["zope.interface >= 4.0.2"]
     args['py_modules'] = modulesToInstall + testDataFiles
     args['zip_safe'] = False
     args['include_package_data'] = True
-    args['data_files'] = getDataFiles("twisted")
     args['cmdclass'] = {'sdist': DisabledSdist}
     args['scripts'] = ['bin/trial', 'bin/twistd']
 

Modified: branches/sdist-use-7985-3/tox.ini
==============================================================================
--- branches/sdist-use-7985-3/tox.ini	(original)
+++ branches/sdist-use-7985-3/tox.ini	Thu Mar  3 09:40:11 2016
@@ -6,12 +6,10 @@
 envlist=
         {py27,py33,py34,py35}-{tests,nomodules,coverage}
         pyflakes,twistedchecker,apidocs,narrativedocs
-skipsdist=True
 
 
 [testenv]
 changedir={envtmpdir}
-skip_install=True
 deps =
      ; zope.interface is love, zope.interface is life
      zope.interface
@@ -33,7 +31,8 @@
      narrativedocs: sphinx
 
 commands =
-    py27-{tests,nomodules}: python {toxinidir}/bin/trial {posargs:twisted}
+    py27-{tests,nomodules}: which trial
+    py27-{tests,nomodules}: trial {posargs:twisted}
     {py33,py34,py35}-{tests,nomodules}: python {toxinidir}/admin/run-python3-tests {posargs:}
 
     twistedchecker: twistedchecker {posargs:twisted}