Skip to content

Commit 23b3f72

Browse files
authored
Merge pull request #5 from ginkgobioworks/python3-xrange-fix
Import xrange for python3
2 parents a76be4b + d5dd066 commit 23b3f72

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

pychemy/peptides.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
import re
2+
3+
from six.moves import xrange
4+
15
from pychemy.amino_acids import AMINO_ACIDS, LOSSES
26
from pychemy.molmass import Formula
3-
import re
47

58

69
# Retreives first amino acid from peptide sequence based on those available in AMINO_ACIDS

setup.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
'Natural Language :: English',
2525
'Operating System :: OS Independent',
2626
'Programming Language :: Python :: 2.7',
27-
'Programming Language :: Python :: 3.4',
27+
'Programming Language :: Python :: 3.5',
2828
'Topic :: Scientific/Engineering :: Artificial Intelligence',
2929
'Topic :: Scientific/Engineering :: Artificial Life',
3030
'Topic :: Scientific/Engineering :: Bio-Informatics',
@@ -34,14 +34,15 @@
3434
'Topic :: Scientific/Engineering :: Visualization',
3535
'Topic :: Software Development :: Libraries :: Python Modules',
3636
],
37+
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4',
3738

3839
packages=['pychemy'],
3940
include_package_data=True,
4041
zip_safe=True,
4142

4243
install_requires=[
4344
'matplotlib',
44-
'networkx',
45+
'networkx~=1.0',
4546
'numpy',
4647
'openbabel',
4748
],

tox.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ envlist = py2, py3
55
setenv =
66
PYTHONHASHSEED=1125308275
77
PYTHONPATH = {toxinidir}:{toxinidir}/pychemy:{toxinidir}/tests
8+
sitepackages = True
89
commands = python setup.py nosetests
910
deps =
1011
nose

0 commit comments

Comments
 (0)