Merge pull request #9 from escherba/es/misc2

update setup.py and links

Author: escherba

README.rst

@@ -15,6 +15,14 @@ A Python wrapper around `MetroHash <https://github.com/jandrewrogers/MetroHash>`
     :target: https://circleci.com/gh/escherba/python-metrohash
     :alt: Tests Status
 
+.. image:: https://img.shields.io/pypi/pyversions/cityhash.svg
+    :target: https://pypi.python.org/pypi/cityhash
+    :alt: Supported Python versions
+
+.. image:: https://img.shields.io/pypi/l/cityhash.svg
+    :target: https://pypi.python.org/pypi/cityhash
+    :alt: License
+
 Getting Started
 ---------------
 
@@ -31,8 +39,8 @@ Example Usage below).
 Usage Examples
 --------------
 
-Simple Hashing
-~~~~~~~~~~~~~~
+Stateless Hashing
+~~~~~~~~~~~~~~~~~
 
 This package provides Python interfaces to 64- and 128-bit implementations of
 MetroHash algorithm. For stateless hashing, it exports ``metrohash64`` and
@@ -117,7 +125,7 @@ See Also
 --------
 For other fast non-cryptographic hashing implementations available as Python
 extensions, see `CityHash <https://github.com/escherba/python-cityhash>`__ and
-`xxh <https://github.com/lebedov/xxh>`__.
+`MurmurHash <https://github.com/hajimes/mmh3>`__.
 
 Authors
 -------
@@ -128,4 +136,4 @@ License
 -------
 This software is licensed under the `Apache License, Version 2.0
 <https://opensource.org/licenses/Apache-2.0>`_.  See the included LICENSE
-file for more information.
+file for details.

pip-freeze.txt

@@ -1,19 +1,33 @@
-attrs==21.3.0
+attrs==21.4.0
+backcall==0.2.0
 Cython==0.29.26
+decorator==5.1.0
 distlib==0.3.4
 filelock==3.4.2
 importlib-metadata==4.10.0
 iniconfig==1.1.1
--e git+https://github.com/escherba/python-metrohash@d7ab131bff70108ef26744882be3c624fb5bff9b#egg=metrohash
+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@73e7ff6160a666ec7075a7f02d1a14031a1385c3#egg=metrohash
 numpy==1.21.5
 packaging==21.3
+parso==0.8.3
+pexpect==4.8.0
+pickleshare==0.7.5
 platformdirs==2.4.1
 pluggy==1.0.0
+prompt-toolkit==3.0.24
+ptyprocess==0.7.0
 py==1.11.0
+Pygments==2.10.0
 pyparsing==3.0.6
 pytest==6.2.5
 six==1.16.0
 toml==0.10.2
+traitlets==5.1.1
 typing_extensions==4.0.1
-virtualenv==20.11.1
+virtualenv==20.11.2
+wcwidth==0.2.5
 zipp==3.6.0

python.mk

@@ -39,7 +39,7 @@ release: env build_ext  ## upload package to PyPI
 .PHONY: shell
 shell: build_ext  ## open Python shell within the virtualenv
 	@echo "Using $(PYVERSION)"
-	$(PYENV) python
+	$(PYENV) ipython
 
 .PHONY: build_ext
 build_ext: $(EXTENSION)  ## build C extension(s)

requirements.txt

@@ -1,4 +1,6 @@
 cython
+ipdb
+ipython
 numpy
 pytest
 setuptools

setup.py

@@ -1,12 +1,13 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
 from os.path import join, dirname
 from setuptools import setup
 from setuptools.extension import Extension
 from setuptools.dist import Distribution
 
 try:
     from cpuinfo import get_cpu_info
-    cpu_info = get_cpu_info()
-    have_sse42 = 'sse4.2' in cpu_info['flags']
+    have_sse42 = 'sse4.2' in get_cpu_info()['flags']
 except Exception:
     have_sse42 = False
 
@@ -15,8 +16,6 @@
 except ImportError:
     build_ext = None
 
-USE_CYTHON = build_ext is not None
-
 
 class BinaryDistribution(Distribution):
     """
@@ -55,7 +54,8 @@ def is_pure(self):
 CMDCLASS = {}
 EXT_MODULES = []
 
-if USE_CYTHON:
+if build_ext is not None:
+    CMDCLASS['build_ext'] = build_ext
     EXT_MODULES.append(
         Extension(
             "metrohash",
@@ -65,7 +65,6 @@ def is_pure(self):
             extra_compile_args=CXXFLAGS,
             include_dirs=INCLUDE_DIRS)
         )
-    CMDCLASS['build_ext'] = build_ext
 else:
     EXT_MODULES.append(
         Extension(
@@ -78,7 +77,7 @@ def is_pure(self):
         )
 
 
-VERSION = '0.1.0.post3'
+VERSION = '0.1.0.post4'
 URL = "https://github.com/escherba/python-metrohash"
 
 
@@ -110,7 +109,7 @@ def get_long_description():
     ext_modules=EXT_MODULES,
     keywords=['hash', 'hashing', 'metrohash', 'cityhash'],
     classifiers=[
-        'Development Status :: 4 - Beta',
+        'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
         'Intended Audience :: Science/Research',
         'License :: OSI Approved :: Apache Software License',
@@ -124,14 +123,12 @@ def get_long_description():
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
-        'Topic :: Internet',
-        'Topic :: Scientific/Engineering',
         'Topic :: Scientific/Engineering :: Information Analysis',
-        'Topic :: Software Development',
-        'Topic :: Software Development :: Libraries :: Python Modules',
+        'Topic :: Software Development :: Libraries',
         'Topic :: Utilities'
     ],
     long_description=get_long_description(),
+    long_description_content_type='text/x-rst',
     tests_require=['pytest'],
     distclass=BinaryDistribution,
 )