r46900 - try some things

Author: hawkowl
Date: Thu Mar  3 10:41:26 2016
New Revision: 46900

Modified:
   branches/sdist-use-7985-3/setup3.py
   branches/sdist-use-7985-3/tox.ini
   branches/sdist-use-7985-3/twisted/plugins/cred_anonymous.py
   branches/sdist-use-7985-3/twisted/plugins/cred_file.py
   branches/sdist-use-7985-3/twisted/python/dist.py
   branches/sdist-use-7985-3/twisted/python/dist3.py
   branches/sdist-use-7985-3/twisted/test/test_twisted.py

Log:
try some things

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 10:41:26 2016
@@ -37,12 +37,13 @@
     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['cmdclass'] = {'sdist': DisabledSdist}
-    args['scripts'] = ['bin/trial', 'bin/twistd']
+    args.update(dict(
+        install_requires=["zope.interface >= 4.0.2"],
+        py_modules=modulesToInstall + testDataFiles,
+        zip_safe=False,
+        include_package_data=True,
+        scripts=['bin/trial', 'bin/twistd'],
+    ))
 
     setup(**args)
 

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 10:41:26 2016
@@ -4,10 +4,10 @@
 skip_missing_interpreters=True
 toxworkdir=build/
 envlist=
-        {py27,py33,py34,py35}-{tests,nomodules,coverage}
+        {py27,py33,py34,py35}-{tests,nomodules,coverage}-posix
+        py27-{tests,nomodules,coverage}-windows,
         pyflakes,twistedchecker,apidocs,narrativedocs
 
-
 [testenv]
 changedir={envtmpdir}
 deps =
@@ -18,7 +18,14 @@
      ; We cannot use extras here, because it is not supported on Py3
      {tests,coverage}: pyopenssl
      {tests,coverage}: service_identity
+     {tests,coverage}: idna
+     {tests,coverage}: pyserial
+     {tests,coverage}: python-subunit
      {tests,coverage}: pycrypto
+     py27-{tests,coverage}-posix: pysqlite
+     windows: pypiwin32
+
+     py27-{tests,coverage}: soappy
 
      coverage: coverage
 
@@ -31,9 +38,8 @@
      narrativedocs: sphinx
 
 commands =
-    py27-{tests,nomodules}: which trial
-    py27-{tests,nomodules}: trial {posargs:twisted}
-    {py33,py34,py35}-{tests,nomodules}: python {toxinidir}/admin/run-python3-tests {posargs:}
+    py27-{tests,nomodules}: {envbindir}/trial {posargs:twisted}
+    {py33,py34,py35}-{tests,nomodules}: python {toxinidir}/admin/run-python3-tests --installed {posargs:}
 
     twistedchecker: twistedchecker {posargs:twisted}
     pyflakes: pyflakes {posargs:twisted}
@@ -42,8 +48,8 @@
     narrativedocs: sphinx-build -aW -b html -d {toxinidir}/docs/_build {toxinidir}/docs {toxinidir}/docs/_build/
 
     coverage: coverage erase
-    py27-coverage: coverage run --rcfile={toxinidir}/.coveragerc {toxinidir}/bin/trial --reporter=bwverbose {posargs:twisted}
-    {py33,py34,py35}-coverage: coverage run --rcfile={toxinidir}/.coveragerc {toxinidir}/admin/run-python3-tests --reporter=bwverbose {posargs:}
+    py27-coverage: coverage run --rcfile={toxinidir}/.coveragerc {envbindir}/trial --reporter=bwverbose {posargs:twisted}
+    {py33,py34,py35}-coverage: coverage run --rcfile={toxinidir}/.coveragerc {toxinidir}/admin/run-python3-tests --installed --reporter=bwverbose {posargs:}
     coverage: coverage report --rcfile={toxinidir}/.coveragerc
 
 [testenv:twistedchecker]

Modified: branches/sdist-use-7985-3/twisted/plugins/cred_anonymous.py
==============================================================================
--- branches/sdist-use-7985-3/twisted/plugins/cred_anonymous.py	(original)
+++ branches/sdist-use-7985-3/twisted/plugins/cred_anonymous.py	Thu Mar  3 10:41:26 2016
@@ -7,6 +7,8 @@
 Cred plugin for anonymous logins.
 """
 
+from __future__ import absolute_import, division
+
 from zope.interface import implementer
 
 from twisted import plugin
@@ -37,4 +39,3 @@
 
 
 theAnonymousCheckerFactory = AnonymousCheckerFactory()
-

Modified: branches/sdist-use-7985-3/twisted/plugins/cred_file.py
==============================================================================
--- branches/sdist-use-7985-3/twisted/plugins/cred_file.py	(original)
+++ branches/sdist-use-7985-3/twisted/plugins/cred_file.py	Thu Mar  3 10:41:26 2016
@@ -7,6 +7,8 @@
 Cred plugin for a file of the format 'username:password'.
 """
 
+from __future__ import absolute_import, division
+
 import sys
 
 from zope.interface import implementer

Modified: branches/sdist-use-7985-3/twisted/python/dist.py
==============================================================================
--- branches/sdist-use-7985-3/twisted/python/dist.py	(original)
+++ branches/sdist-use-7985-3/twisted/python/dist.py	Thu Mar  3 10:41:26 2016
@@ -26,7 +26,7 @@
     as setuptools version specifiers, used to populate L{_EXTRAS_REQUIRE}.
 """
 
-from distutils.command import build_scripts, install_data, build_ext
+from distutils.command import build_scripts, build_ext
 from distutils.errors import CompileError
 from setuptools import setup as _setup
 from setuptools import Extension

Modified: branches/sdist-use-7985-3/twisted/python/dist3.py
==============================================================================
--- branches/sdist-use-7985-3/twisted/python/dist3.py	(original)
+++ branches/sdist-use-7985-3/twisted/python/dist3.py	Thu Mar  3 10:41:26 2016
@@ -135,6 +135,8 @@
     "twisted.persisted.styles",
     "twisted.plugin",
     "twisted.plugins",
+    "twisted.plugins.cred_anonymous",
+    "twisted.plugins.cred_file",
     "twisted.plugins.cred_sshkeys",
     "twisted.plugins.twisted_trial",
     "twisted.plugins.twisted_web",
@@ -451,6 +453,10 @@
     "twisted.trial.test.packages",
     "twisted.trial.test.sample",
     "twisted.trial.test.scripttest",
+    "twisted.trial.test.weird",
+    "twisted.trial.test.mockcustomsuite",
+    "twisted.trial.test.mockcustomsuite2",
+    "twisted.trial.test.mockcustomsuite3",
 ]
 
 

Modified: branches/sdist-use-7985-3/twisted/test/test_twisted.py
==============================================================================
--- branches/sdist-use-7985-3/twisted/test/test_twisted.py	(original)
+++ branches/sdist-use-7985-3/twisted/test/test_twisted.py	Thu Mar  3 10:41:26 2016
@@ -671,9 +671,11 @@
                 "twisted.{}._version".format(self.subproject))
 
 
-
-subprojects = ["mail", "conch", "runner", "web", "words", "names", "news",
-               "pair"]
+if _PY3:
+    subprojects = ["conch", "web", "names"]
+else:
+    subprojects = ["mail", "conch", "runner", "web", "words", "names", "news",
+                   "pair"]
 
 for subproject in subprojects: