Skip to content

Commit 9891a6d

Browse files
committed
Merge pull request #19 from ocefpaf/pip_install
pip install with forked geoalchemy
2 parents 9b9dff5 + 8a94f14 commit 9891a6d

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

MANIFEST.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
include README.md
2+
include *.txt
3+

requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
pyodbc
2+
pymysql
3+
#psycopg2 # Commented out because I could not pip install it.
14
six
25
sqlalchemy
3-
-e git+https://github.com/ODM2/geoalchemy.git
4-
6+
geoalchemy==0.7.3
57
shapely
6-
78
#matplotlib
89
dateutils
910
pandas
10-
1111
#sqlalchemy-migrate

setup.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
from os import path
1818

1919
here = path.abspath(path.dirname(__file__))
20+
with open('requirements.txt') as f:
21+
require = f.readlines()
22+
install_requires = [r.strip() for r in require]
2023

2124
# Get the long description from the relevant file
2225
# with open(path.join(here, 'DESCRIPTION.rst'), encoding='utf-8') as f:
@@ -76,11 +79,10 @@
7679
# requirements files see:
7780
# https://packaging.python.org/en/latest/requirements.html
7881

79-
install_requires=['pandas', 'sqlalchemy', 'geoalchemy>=0.7.3.dev',
80-
'pyodbc', 'pymysql', 'psycopg2', 'shapely'],
82+
install_requires=install_requires,
8183
# dependency_links- geoalchemy from the ODM repository
8284
dependency_links=[
83-
"git+https://github.com/ODM2/geoalchemy.git@odm2#egg=geoalchemy-0.7.3.dev"
85+
"git+https://github.com/ODM2/geoalchemy.git@v0.7.3#egg=geoalchemy-0.7.3"
8486
],
8587

8688
# List additional groups of dependencies here (e.g. development

0 commit comments

Comments
 (0)