update setup.py (#14)

Author: escherba

pip-freeze.txt

@@ -10,7 +10,7 @@ ipdb==0.13.9
 ipython==7.30.1
 jedi==0.18.1
 matplotlib-inline==0.1.3
--e git+https://github.com/escherba/python-metrohash@35159617ba4106c99b82701267441c73aca4b951#egg=metrohash
+-e git+https://github.com/escherba/python-metrohash@c0d6ef1dac61d9cfb3cba5bb8533f69df3c445e6#egg=metrohash
 numpy==1.21.5
 packaging==21.3
 parso==0.8.3

python.mk

@@ -82,7 +82,7 @@ env/bin/activate: setup.py requirements.txt
 	test -f $@ || virtualenv $(VENV_OPTS) env
 	export SETUPTOOLS_USE_DISTUTILS=stdlib; $(PYENV) curl https://bootstrap.pypa.io/ez_setup.py | $(INTERPRETER)
 	$(PIP) install -U pip wheel
-	$(PIP) install -r requirements.txt
+	export SETUPTOOLS_USE_DISTUTILS=stdlib; $(PIP) install -r requirements.txt
 	$(PIP) install -e .
 	$(PIP) freeze > pip-freeze.txt
 	touch $@

setup.py

@@ -9,15 +9,15 @@
 
 try:
     from cpuinfo import get_cpu_info
-    cpu_info = get_cpu_info()
-    HAVE_SSE42 = 'sse4_2' in cpu_info['flags']
+    CPU_FLAGS = get_cpu_info()['flags']
 except Exception as exc:
-    HAVE_SSE42 = False
+    CPU_FLAGS = {}
 
 try:
     from Cython.Distutils import build_ext
+    USE_CYTHON = True
 except ImportError:
-    build_ext = None
+    USE_CYTHON = False
 
 
 class BinaryDistribution(Distribution):
@@ -30,16 +30,19 @@ def is_pure(self):
         return False
 
 
-CXXFLAGS = ["-O3"]
+CXXFLAGS = []
 
-if os.name != "nt":
+if os.name == "nt":
+    CXXFLAGS.extend(["/O3"])
+else:
     CXXFLAGS.extend([
+        "-O3",
         "-Wno-unused-value",
         "-Wno-unused-function",
     ])
 
 
-if HAVE_SSE42:
+if 'sse4_2' in CPU_FLAGS:
     warnings.warn("Compiling with SSE4.2 enabled")
     CXXFLAGS.append('-msse4.2')
 else:
@@ -63,7 +66,7 @@ def is_pure(self):
 CMDCLASS = {}
 EXT_MODULES = []
 
-if build_ext is not None:
+if USE_CYTHON:
     CMDCLASS['build_ext'] = build_ext
     EXT_MODULES.append(
         Extension(
@@ -72,8 +75,9 @@ def is_pure(self):
             depends=CXXHEADERS,
             language="c++",
             extra_compile_args=CXXFLAGS,
-            include_dirs=INCLUDE_DIRS)
+            include_dirs=INCLUDE_DIRS,
         )
+    )
 else:
     EXT_MODULES.append(
         Extension(
@@ -82,11 +86,12 @@ def is_pure(self):
             depends=CXXHEADERS,
             language="c++",
             extra_compile_args=CXXFLAGS,
-            include_dirs=INCLUDE_DIRS)
+            include_dirs=INCLUDE_DIRS,
         )
+    )
 
 
-VERSION = '0.1.1.post0'
+VERSION = '0.1.1.post1'
 URL = "https://github.com/escherba/python-metrohash"
 
 
@@ -116,7 +121,7 @@ def get_long_description():
     zip_safe=False,
     cmdclass=CMDCLASS,
     ext_modules=EXT_MODULES,
-    keywords=['hash', 'hashing', 'metrohash', 'cityhash'],
+    keywords=['hash', 'hashing', 'metrohash'],
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',

src/metrohash.cpp

@@ -10,7 +10,7 @@ Python wrapper for MetroHash, a fast non-cryptographic hashing algorithm
 
 __author__  = "Eugene Scherba"
 __email__   = "escherba+metrohash@gmail.com"
-__version__ = "0.1.1.post0"
+__version__ = "0.1.1.post1"
 __all__     = [
     "metrohash64",
     "metrohash128",