Skip to content

Commit f9d1111

Browse files
author
Scott Sanderson
committed
Merge pull request #8 from quantopian/update_dependencies
Update dependencies
2 parents d37f43a + 4a169d9 commit f9d1111

File tree

5 files changed

+22
-13
lines changed

5 files changed

+22
-13
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ htmlcov/
3737
.tox/
3838
.coverage
3939
.cache
40+
.noseids
4041
nosetests.xml
4142
coverage.xml
4243

pgcontents/alembic/env.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
from __future__ import with_statement
22
from alembic import context
3-
from sqlalchemy import engine_from_config, pool
43
from logging.config import fileConfig
4+
from sqlalchemy import engine_from_config, pool
5+
from os.path import dirname, abspath
6+
7+
import sys
8+
9+
from pgcontents.schema import metadata
510

611
# this is the Alembic Config object, which provides
712
# access to the values within the .ini file in use.
@@ -15,10 +20,8 @@
1520
# for 'autogenerate' support
1621
# from myapp import mymodel
1722
# target_metadata = mymodel.Base.metadata
18-
from os.path import dirname, abspath
19-
import sys
2023
sys.path.append(dirname(dirname(dirname(abspath(__file__)))))
21-
from pgcontents.schema import metadata
24+
2225
target_metadata = metadata
2326

2427
# other values from the config, defined by the needs of env.py,

requirements.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@ Jinja2==2.7.3
22
Mako==1.0.0
33
MarkupSafe==0.23
44
Pygments==2.0.1
5-
SQLAlchemy==0.9.8
6-
alembic==0.7.1
5+
SQLAlchemy==1.0.5
6+
alembic==0.7.6
77
argparse==1.2.1
88
backports.ssl-match-hostname==3.4.0.2
99
certifi==14.05.14
1010
fancycompleter==0.4
11-
-e [email protected]:quantopian/ipython.git@8fd1a6f42bd2785c902ab0411b50afa4051699b1#egg=ipython-master
11+
ipython==3.2.0
1212
jsonschema==2.4.0
1313
mistune==0.5.0
14-
psycopg2==2.5.4
14+
psycopg2==2.6.1
1515
pyrepl==0.8.4
1616
pyzmq==14.4.1
1717
tornado==4.0.2
1818
wmctrl==0.1
19-
requests==2.5.0
20-
six==1.8.0
19+
requests==2.7.0
20+
six==1.9.0
2121
click==3.3

requirements_dev.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Test reqs.
22
nose==1.3.4
3-
python-dateutil
4-
nose-ignore-docstring
3+
python-dateutil==2.4.2
4+
nose-ignore-docstring==0.2
5+
pyflakes==0.9.2
6+
pep8==1.6.2
7+
mccabe==0.3.1
58
flake8==2.2.5

setup.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ def main():
2020
reqs_file = join(dirname(__file__), 'requirements.txt')
2121
with open(reqs_file) as f:
2222
requirements = [
23-
req for req in f.readlines() if not req.strip().startswith('-e')
23+
req.replace('==', '>=')
24+
for req in f.readlines()
25+
if not req.strip().startswith('-e')
2426
]
2527

2628
setup(

0 commit comments

Comments
 (0)