Skip to content
This repository was archived by the owner on Jun 27, 2020. It is now read-only.

Commit 7854db4

Browse files
committed
pyOpenSSL 0.13 and later breaks with old SSL
1 parent 6435ea5 commit 7854db4

File tree

2 files changed

+36
-34
lines changed

2 files changed

+36
-34
lines changed

setup.py

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -34,30 +34,31 @@ def all_files(dir, lstrip):
3434
author = 'William Stein et al.',
3535
author_email= 'http://groups.google.com/group/sage-notebook',
3636
url = 'http://code.google.com/p/sagenb',
37-
install_requires = ['twisted>=11.0.0',
38-
'flask',
39-
'flask-openid',
40-
'flask-autoindex',
41-
'babel',
42-
'flask-babel',
43-
'hg-git',
44-
'pyOpenSSL'],
37+
install_requires = [ 'twisted>=11.0.0'
38+
, 'flask'
39+
, 'flask-openid'
40+
, 'flask-autoindex'
41+
, 'babel'
42+
, 'flask-babel'
43+
, 'hg-git'
44+
, 'pyOpenSSL<=0.12'
45+
],
4546
test_suite = 'sagenb.testing.run_tests.all_tests',
46-
packages = ['sagenb',
47-
'sagenb.interfaces',
48-
'sagenb.misc',
49-
'sagenb.notebook',
50-
'sagenb.notebook.compress',
51-
'sagenb.simple',
52-
'sagenb.storage',
53-
'sagenb.testing',
54-
'sagenb.testing.tests',
55-
'sagenb.testing.selenium'
56-
],
47+
packages = [ 'sagenb'
48+
, 'sagenb.interfaces'
49+
, 'sagenb.misc'
50+
, 'sagenb.notebook'
51+
, 'sagenb.notebook.compress'
52+
, 'sagenb.simple'
53+
, 'sagenb.storage'
54+
, 'sagenb.testing'
55+
, 'sagenb.testing.tests'
56+
, 'sagenb.testing.selenium'
57+
],
5758
scripts = [ 'sagenb/data/sage3d/sage3d',
5859
],
5960
package_data = {'sagenb':
6061
all_files('sagenb/data', 'sagenb/') +
6162
all_files('sagenb/translations', 'sagenb/')
62-
},
63+
},
6364
)

spkg-dist

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -88,20 +88,21 @@ def fetch_packages():
8888
tmp_dir = mkdtemp()
8989

9090
# in order of dependencies
91-
required_packages = ('twisted>=11.0.0',
92-
'pytz>=2011n',
93-
'Babel>=0.9.6',
94-
'Werkzeug>=0.8.2',
95-
'speaklater>=1.2',
96-
'python-openid>=2.2.5',
97-
'Flask>=0.8',
98-
'Flask-Silk>=0.1.1',
99-
'Flask-AutoIndex>=0.4.0',
100-
'Flask-Babel>=0.8',
101-
'Flask-OpenID>=1.0.1',
102-
'dulwich>=0.8.0',
103-
'hg-git>=0.3.1',
104-
'pyOpenSSL')
91+
required_packages = ( 'twisted>=11.0.0'
92+
, 'pytz>=2011n'
93+
, 'Babel>=0.9.6'
94+
, 'Werkzeug>=0.8.2'
95+
, 'speaklater>=1.2'
96+
, 'python-openid>=2.2.5'
97+
, 'Flask>=0.8'
98+
, 'Flask-Silk>=0.1.1'
99+
, 'Flask-AutoIndex>=0.4.0'
100+
, 'Flask-Babel>=0.8'
101+
, 'Flask-OpenID>=1.0.1'
102+
, 'dulwich>=0.8.0'
103+
, 'hg-git>=0.3.1'
104+
, 'pyOpenSSL<=0.12'
105+
)
105106
pkg_locations = []
106107

107108
for pkg in required_packages:

0 commit comments

Comments
 (0)