Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update geomet to align with requirements.txt #1236

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,15 @@ def run(self):

try:
os.makedirs(path)
except:
except OSError:
pass

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

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


is_windows = sys.platform.startswith('win32')
is_macos = sys.platform.startswith('darwin')

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


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


DEFAULT_LIBEV_INCLUDES = ['/usr/include/libev', '/usr/local/include', '/opt/local/include', '/usr/include']
DEFAULT_LIBEV_LIBDIRS = ['/usr/local/lib', '/opt/local/lib', '/usr/lib64']
libev_includes = eval_env_var_as_array('CASS_DRIVER_LIBEV_INCLUDES') or DEFAULT_LIBEV_INCLUDES
Expand Down Expand Up @@ -338,7 +341,7 @@ def pre_build_check():
# We must be able to initialize the compiler if it has that method
if hasattr(compiler, "initialize"):
compiler.initialize()
except:
except OSError:
return False

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

dependencies = ['geomet>=0.1,<0.3']
dependencies = ['geomet>=1.1']

_EXTRAS_REQUIRE = {
'graph': ['gremlinpython==3.4.6'],
Expand Down