Skip to content

Commit ea53325

Browse files
committed
unify install_requires in requirements.txt
1 parent 7e068a4 commit ea53325

File tree

2 files changed

+25
-10
lines changed

2 files changed

+25
-10
lines changed

requirements.txt

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
matplotlib>=1.0.0
2+
numpy>=1.2.1
13
pyproj>=1.9.3
24
pyshp>=1.2.0
35
six

setup.py

+23-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
from __future__ import (absolute_import, division, print_function)
22

3-
import sys, glob, os, subprocess
3+
import glob
4+
import io
5+
import os
6+
import sys
7+
from setuptools.dist import Distribution
48

59
if sys.version_info < (2, 6):
610
raise SystemExit("""matplotlib and the basemap toolkit require Python 2.6 or later.""")
@@ -21,6 +25,21 @@
2125
inc_dirs.append(numpy.get_include())
2226

2327

28+
def read(path, encoding='utf-8'):
29+
path = os.path.join(os.path.dirname(__file__), path)
30+
with io.open(path, encoding=encoding) as fp:
31+
return fp.read()
32+
33+
34+
def get_install_requirements(path):
35+
content = read(path)
36+
return [
37+
req
38+
for req in content.split("\n")
39+
if req != '' and not req.startswith('#')
40+
]
41+
42+
2443
def checkversion(GEOS_dir):
2544
"""check geos C-API header file (geos_c.h)"""
2645
try:
@@ -104,13 +123,7 @@ def checkversion(GEOS_dir):
104123
datafiles = [os.path.join('data',os.path.basename(f)) for f in datafiles]
105124
package_data = {'mpl_toolkits.basemap':datafiles}
106125

107-
requirements = [
108-
"numpy>=1.2.1",
109-
"matplotlib>=1.0.0",
110-
"pyproj >= 1.9.3",
111-
"pyshp >= 1.2.0",
112-
"six",
113-
]
126+
install_requires = get_install_requirements("requirements.txt")
114127

115128
__version__ = "1.1.0"
116129
setup(
@@ -128,7 +141,7 @@ def checkversion(GEOS_dir):
128141
author_email = "[email protected]",
129142
maintainer = "Ben Root",
130143
maintainer_email = "[email protected]",
131-
install_requires = requirements,
144+
install_requires = install_requires,
132145
platforms = ["any"],
133146
license = "OSI Approved",
134147
keywords = ["python","plotting","plots","graphs","charts","GIS","mapping","map projections","maps"],
@@ -143,6 +156,6 @@ def checkversion(GEOS_dir):
143156
packages = packages,
144157
namespace_packages = namespace_packages,
145158
package_dir = package_dirs,
146-
ext_modules = extensions,
159+
ext_modules = extensions,
147160
package_data = package_data
148161
)

0 commit comments

Comments
 (0)