Skip to content

Commit fe8e926

Browse files
authored
Update geomet to align with requirements.txt (#1236)
1 parent 84ece0b commit fe8e926

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

setup.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,15 @@ def run(self):
7474

7575
try:
7676
os.makedirs(path)
77-
except:
77+
except OSError:
7878
pass
7979

8080
if has_subprocess:
8181
# Prevent run with in-place extensions because cython-generated objects do not carry docstrings
8282
# http://docs.cython.org/src/userguide/special_methods.html#docstrings
8383
import glob
8484
for f in glob.glob("cassandra/*.so"):
85-
print("Removing '%s' to allow docs to run on pure python modules." %(f,))
85+
print("Removing '%s' to allow docs to run on pure python modules." % (f,))
8686
os.unlink(f)
8787

8888
# Build io extension to make import and docstrings work
@@ -114,16 +114,19 @@ class BuildFailed(Exception):
114114
def __init__(self, ext):
115115
self.ext = ext
116116

117+
117118
is_windows = sys.platform.startswith('win32')
118119
is_macos = sys.platform.startswith('darwin')
119120

120121
murmur3_ext = Extension('cassandra.cmurmur3',
121122
sources=['cassandra/cmurmur3.c'])
122123

124+
123125
def eval_env_var_as_array(varname):
124126
val = os.environ.get(varname)
125127
return None if not val else [v.strip() for v in val.split(',')]
126128

129+
127130
DEFAULT_LIBEV_INCLUDES = ['/usr/include/libev', '/usr/local/include', '/opt/local/include', '/usr/include']
128131
DEFAULT_LIBEV_LIBDIRS = ['/usr/local/lib', '/opt/local/lib', '/usr/lib64']
129132
libev_includes = eval_env_var_as_array('CASS_DRIVER_LIBEV_INCLUDES') or DEFAULT_LIBEV_INCLUDES
@@ -338,7 +341,7 @@ def pre_build_check():
338341
# We must be able to initialize the compiler if it has that method
339342
if hasattr(compiler, "initialize"):
340343
compiler.initialize()
341-
except:
344+
except OSError:
342345
return False
343346

344347
executables = []
@@ -383,7 +386,7 @@ def run_setup(extensions):
383386
else:
384387
sys.stderr.write("Bypassing Cython setup requirement\n")
385388

386-
dependencies = ['geomet>=0.1,<0.3']
389+
dependencies = ['geomet>=1.1']
387390

388391
_EXTRAS_REQUIRE = {
389392
'graph': ['gremlinpython==3.4.6'],

0 commit comments

Comments
 (0)