Skip to content

Commit

Permalink
remove from setup, remove from docs
Browse files Browse the repository at this point in the history
  • Loading branch information
hawkowl committed Sep 16, 2016
1 parent f126599 commit 1d537ac
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 14 deletions.
2 changes: 0 additions & 2 deletions docs/installation/howto/optional.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ The following optional dependencies are supported:
* `idna`_

* **conch** - packages for working with conch/SSH.
* `gmpy`_
* `pyasn1`_
* `cryptography`_

Expand All @@ -57,7 +56,6 @@ The following optional dependencies are supported:
.. _pydoctor: https://pypi.python.org/pypi/pydoctor
.. _pyOpenSSL: https://pypi.python.org/pypi/pyOpenSSL
.. _service_identity: https://pypi.python.org/pypi/service_identity
.. _gmpy: https://pypi.python.org/pypi/gmpy/1.17
.. _pyasn1: https://pypi.python.org/pypi/pyasn1
.. _cryptography: https://pypi.python.org/pypi/cryptography
.. _SOAPpy: https://pypi.python.org/pypi/SOAPpy
Expand Down
1 change: 1 addition & 0 deletions src/twisted/conch/topfiles/8079.removal
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
twisted.conch.ssh no longer uses gmpy, if available. gmpy is unmaintained, does not have binary wheels for any platforms, and an alternative for higher performance is available in the form of PyPy.
17 changes: 9 additions & 8 deletions src/twisted/python/_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,15 @@

_EXTRA_OPTIONS = dict(
dev=_dev,
tls=['pyopenssl >= 16.0.0',
'service_identity',
'idna >= 0.6'],
conch=['gmpy',
'pyasn1',
'cryptography >= 0.9.1',
'appdirs >= 1.4.0',
],
tls=[
'pyopenssl >= 16.0.0',
'service_identity',
'idna >= 0.6'],
conch=[
'pyasn1',
'cryptography >= 0.9.1',
'appdirs >= 1.4.0',
],
soap=['soappy'],
serial=['pyserial'],
osx=['pyobjc'],
Expand Down
4 changes: 0 additions & 4 deletions src/twisted/python/test/test_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ def test_extrasRequiresConchDeps(self):
work.
"""
deps = _EXTRAS_REQUIRE['conch']
self.assertIn('gmpy', deps)
self.assertIn('pyasn1', deps)
self.assertIn('cryptography >= 0.9.1', deps)
self.assertIn('appdirs >= 1.4.0', deps)
Expand Down Expand Up @@ -186,7 +185,6 @@ def test_extrasRequiresAllNonPlatformDeps(self):
self.assertIn('pyopenssl >= 16.0.0', deps)
self.assertIn('service_identity', deps)
self.assertIn('idna >= 0.6', deps)
self.assertIn('gmpy', deps)
self.assertIn('pyasn1', deps)
self.assertIn('cryptography >= 0.9.1', deps)
self.assertIn('soappy', deps)
Expand All @@ -206,7 +204,6 @@ def test_extrasRequiresOsxPlatformDeps(self):
self.assertIn('pyopenssl >= 16.0.0', deps)
self.assertIn('service_identity', deps)
self.assertIn('idna >= 0.6', deps)
self.assertIn('gmpy', deps)
self.assertIn('pyasn1', deps)
self.assertIn('cryptography >= 0.9.1', deps)
self.assertIn('soappy', deps)
Expand All @@ -226,7 +223,6 @@ def test_extrasRequiresWindowsPlatformDeps(self):
self.assertIn('pyopenssl >= 16.0.0', deps)
self.assertIn('service_identity', deps)
self.assertIn('idna >= 0.6', deps)
self.assertIn('gmpy', deps)
self.assertIn('pyasn1', deps)
self.assertIn('cryptography >= 0.9.1', deps)
self.assertIn('soappy', deps)
Expand Down

0 comments on commit 1d537ac

Please sign in to comment.