Merge fix-metadata-7967: Fix setup/INSTALL metadata.

Author: hawkowl Reviewer: hynek Fixes: twisted#7967 git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@45246 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
ardy30 · Jul 12, 2015 · e7feae3 · e7feae3
1 parent 55f7231
commit e7feae3
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 27 deletions.
diff --git a/INSTALL b/INSTALL
@@ -1,18 +1,20 @@
 Requirements
 
-  Python 2.6 or 2.7.
+  Python 2.6, 2.7, 3.3 (subset of functionality), or 3.4 (subset of
+  functionality).
 
-  Zope Interface 3.6.0 or better (http://pypi.python.org/pypi/zope.interface)
+  Zope Interface 3.6.0 or newer (<https://pypi.python.org/pypi/zope.interface>).
+  Zope Interface 4.0 or newer is required for Python 3.
 
-  pyOpenSSL (<http://launchpad.net/pyopenssl>) is required for any SSL APIs.
-  Version 0.10 or newer is required.
+  pyOpenSSL (<https://github.com/pyca/pyopenssl>) is required for any SSL APIs.
+  Version 0.13 or newer is required, but 0.15.1 or newer is recommended.
 
-  On Windows pywin32 (<http://sourceforge.net/projects/pywin32/files/>) is
-  required.  Build 215 or later is highly recommended for reliable operation
+  On Windows pywin32 (<https://pypi.python.org/pypi/pypiwin32>) is required.
+  Build 215 or later is highly recommended for reliable operation
   (this is already included in ActivePython).
 
   If you would like to use Trial's subunit reporter, then you will need to
-  install Subunit 0.0.2 or later (https://launchpad.net/subunit).
+  install Subunit 0.0.2 or later (<https://launchpad.net/subunit>).
 
 Installation
 
@@ -23,7 +25,12 @@ Installation
     Twisted is in their package repositories.
 
   * Win32
-    Installers are available from http://twistedmatrix.com/
+    Installers are available from <https://twistedmatrix.com/>.
+
+  * pip
+    The latest released version of Twisted can be installed by pip:
+
+      pip install Twisted
 
   * Other
     As with other Python packages, the standard way of installing from source

diff --git a/LICENSE b/LICENSE
@@ -1,7 +1,8 @@
 Copyright (c) 2001-2015
 Allen Short
-Andy Gayton
+Amber Hawkie Brown
 Andrew Bennetts
+Andy Gayton
 Antoine Pitrou
 Apple Computer, Inc.
 Ashwini Oruganti
@@ -14,25 +15,24 @@ Donovan Preston
 Eric Mangold
 Eyal Lotem
 Google Inc.
-Hawkie Owl
 Hybrid Logic Ltd.
 Hynek Schlawack
 Itamar Turner-Trauring
 James Knight
 Jason A. Mobarak
 Jean-Paul Calderone
 Jessica McKellar
+Jonathan D. Simms
 Jonathan Jacobs
 Jonathan Lange
-Jonathan D. Simms
-Jürgen Hermann
 Julian Berman
+Jürgen Hermann
 Kevin Horn
 Kevin Turner
 Laurens Van Houtven
 Mary Gardiner
-Matthew Lefkowitz
 Massachusetts Institute of Technology
+Matthew Lefkowitz
 Moshe Zadka
 Paul Swartz
 Pavel Pergamenshchik
@@ -41,11 +41,11 @@ Richard Wall
 Sean Riley
 Software Freedom Conservancy
 Tavendo GmbH
-Travis B. Hartwell
 Thijs Triemstra
 Thomas Herve
 Timothy Allen
 Tom Prince
+Travis B. Hartwell
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

diff --git a/twisted/python/dist.py b/twisted/python/dist.py
@@ -57,19 +57,20 @@
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.3",
+        "Programming Language :: Python :: 3.4",
         ],
     )
 
 
 
 _EXTRA_OPTIONS = dict(
-    dev=['twistedchecker >= 0.2.0',
-         'pyflakes >= 0.8.1',
+    dev=['twistedchecker >= 0.4.0',
+         'pyflakes >= 0.9.2',
          'twisted-dev-tools >= 0.0.2',
          'python-subunit',
-         'sphinx >= 1.2.2',
-         'pydoctor >= 0.5'],
-    tls=['pyopenssl >= 0.11',
+         'sphinx >= 1.3.1',
+         'pydoctor >= 15.0.0'],
+    tls=['pyopenssl >= 0.13',
          'service_identity',
          'idna >= 0.6'],
     conch=['gmpy',

diff --git a/twisted/python/test/test_dist.py b/twisted/python/test/test_dist.py
@@ -101,12 +101,12 @@ def test_extrasRequiresDevDeps(self):
         the tools required for Twisted development.
         """
         deps = _EXTRAS_REQUIRE['dev']
-        self.assertIn('twistedchecker >= 0.2.0', deps)
-        self.assertIn('pyflakes >= 0.8.1', deps)
+        self.assertIn('twistedchecker >= 0.4.0', deps)
+        self.assertIn('pyflakes >= 0.9.2', deps)
         self.assertIn('twisted-dev-tools >= 0.0.2', deps)
         self.assertIn('python-subunit', deps)
-        self.assertIn('sphinx >= 1.2.2', deps)
-        self.assertIn('pydoctor >= 0.5', deps)
+        self.assertIn('sphinx >= 1.3.1', deps)
+        self.assertIn('pydoctor >= 15.0.0', deps)
 
 
     def test_extrasRequiresTlsDeps(self):
@@ -116,7 +116,7 @@ def test_extrasRequiresTlsDeps(self):
         work for both clients and servers.
         """
         deps = _EXTRAS_REQUIRE['tls']
-        self.assertIn('pyopenssl >= 0.11', deps)
+        self.assertIn('pyopenssl >= 0.13', deps)
         self.assertIn('service_identity', deps)
         self.assertIn('idna >= 0.6', deps)
 
@@ -162,7 +162,7 @@ def test_extrasRequiresAllNonPlatformDeps(self):
         all supported operating systems.
         """
         deps = _EXTRAS_REQUIRE['all_non_platform']
-        self.assertIn('pyopenssl >= 0.11', deps)
+        self.assertIn('pyopenssl >= 0.13', deps)
         self.assertIn('service_identity', deps)
         self.assertIn('idna >= 0.6', deps)
         self.assertIn('gmpy', deps)
@@ -179,7 +179,7 @@ def test_extrasRequiresOsxPlatformDeps(self):
         Mac OS X platform.
         """
         deps = _EXTRAS_REQUIRE['osx_platform']
-        self.assertIn('pyopenssl >= 0.11', deps)
+        self.assertIn('pyopenssl >= 0.13', deps)
         self.assertIn('service_identity', deps)
         self.assertIn('idna >= 0.6', deps)
         self.assertIn('gmpy', deps)
@@ -197,7 +197,7 @@ def test_extrasRequiresWindowsPlatformDeps(self):
         Microsoft Windows platform.
         """
         deps = _EXTRAS_REQUIRE['windows_platform']
-        self.assertIn('pyopenssl >= 0.11', deps)
+        self.assertIn('pyopenssl >= 0.13', deps)
         self.assertIn('service_identity', deps)
         self.assertIn('idna >= 0.6', deps)
         self.assertIn('gmpy', deps)

diff --git a/twisted/topfiles/7967.misc b/twisted/topfiles/7967.misc