add cp311 support (v0.3.3) (#24)

* add cp311 support (v0.3.3)

* update build badge

Author: escherba

.github/workflows/build.yml

@@ -15,33 +15,33 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest, macos-latest, ubuntu-latest]
-        python-version: ["3.10"]
+        python-version: ["3.11"]
 
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v2
 
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-        architecture: x64
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+          architecture: x64
 
-    # block below based on:
-    # https://medium.com/ai2-blog/python-caching-in-github-actions-e9452698e98d
-    - uses: actions/cache@v2
-      with:
-        path: ${{ env.pythonLocation }}
-        key: ${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('pip-freeze.txt') }}
+      # block below based on:
+      # https://medium.com/ai2-blog/python-caching-in-github-actions-e9452698e98d
+      - uses: actions/cache@v3
+        with:
+          path: ${{ env.pythonLocation }}
+          key: ${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('pip-freeze.txt') }}
 
-    - name: Install dependencies
-      run: |
-        pip install --upgrade --upgrade-strategy eager setuptools wheel
-        pip install --upgrade --upgrade-strategy eager -r requirements.txt
-        pip freeze > pip-freeze.txt
+      - name: Install dependencies
+        run: |
+          pip install --upgrade --upgrade-strategy eager setuptools wheel
+          pip install --upgrade --upgrade-strategy eager -r requirements.txt
+          pip freeze > pip-freeze.txt
 
-    - name: Test with pytest
-      run: |
-        python setup.py build_ext --inplace
-        pip install -e .
-        python -m pytest
+      - name: Test with pytest
+        run: |
+          python setup.py build_ext --inplace
+          pip install -e .
+          python -m pytest

.github/workflows/publish.yml

@@ -19,29 +19,29 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: '3.9'
       - name: Set up QEMU
         if: runner.os == 'Linux'
         # uses: docker/setup-qemu-action@v1.0.1
-        uses: docker/setup-qemu-action@v1.2.0
+        uses: docker/setup-qemu-action@v2
         with:
           platforms: arm64
       - name: Build wheels
         # uses: joerick/cibuildwheel@v1.9.0
-        uses: pypa/cibuildwheel@v2.9.0
+        uses: pypa/cibuildwheel@v2.11.2
         with:
           output-dir: wheelhouse
         env:
-          CIBW_BUILD: '{cp36,cp37,cp38,cp39,cp310}-{manylinux_x86_64,manylinux_aarch64,win32,win_amd64,macosx_x86_64} {cp39,cp310}-macosx_arm64'
+          CIBW_BUILD: '{cp36,cp37,cp38,cp39,cp310,cp311}-{manylinux_x86_64,manylinux_aarch64,win32,win_amd64,macosx_x86_64} {cp39,cp310,cp311}-macosx_arm64'
           CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014
           CIBW_ARCHS_LINUX: 'auto aarch64'
           CIBW_ARCHS_MACOS: 'auto arm64'
           CIBW_TEST_REQUIRES: pytest
           CIBW_TEST_COMMAND: 'pytest -s {project}/tests'
-          # CIBW_TEST_SKIP: '*-macosx_arm64'  # Until the day Apple silicon instances are available on GitHub Actions
-      - uses: actions/upload-artifact@v2
+          CIBW_TEST_SKIP: '*-macosx_arm64'  # Until the day Apple silicon instances are available on GitHub Actions
+      - uses: actions/upload-artifact@v3
         with:
           path: ./wheelhouse/*.whl
   build_sdist:
@@ -51,14 +51,14 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: '3.9'
       - name: Build sdist
         run: |
           pip install py-cpuinfo
           python setup.py build sdist
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           path: dist/*.tar.gz
   publish:
@@ -67,11 +67,11 @@ jobs:
     needs: [build_wheels, build_sdist]
     steps:
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: '3.9'
       - name: Set up built items
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: artifact
           path: dist

.gitignore

@@ -75,3 +75,7 @@ target/
 
 # Makefile artifacts
 .build_stamp
+
+# Python 3.11
+lib64
+pyvenv.cfg

README.md

@@ -3,7 +3,7 @@
 Python wrapper for [MetroHash](https://github.com/jandrewrogers/MetroHash), a
 fast non-cryptographic hash function.
 
-[![Build Status](https://img.shields.io/github/workflow/status/escherba/python-metrohash/build/master)](https://github.com/escherba/python-metrohash/actions/workflows/build.yml)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/escherba/python-metrohash/build.yml?branch=master)](https://github.com/escherba/python-metrohash/actions/workflows/build.yml)
 [![Latest
 Version](https://img.shields.io/pypi/v/metrohash.svg)](https://pypi.python.org/pypi/metrohash)
 [![Downloads](https://img.shields.io/pypi/dm/metrohash.svg)](https://pypistats.org/packages/metrohash)
@@ -102,7 +102,7 @@ makefile commands:
 ``` bash
 git clone https://github.com/escherba/python-metrohash.git
 cd python-metrohash
-make env           # create a Python virtualenv
+make env           # create a virtual environment
 make test          # run Python tests
 make cpp-test      # run C++ tests
 make shell         # enter IPython shell

pip-freeze.txt

@@ -1,31 +1,30 @@
+appnope==0.1.3
+asttokens==2.2.1
 attrs==22.1.0
 backcall==0.2.0
 Cython==0.29.32
 decorator==5.1.1
-importlib-metadata==4.8.3
+exceptiongroup==1.0.4
+executing==1.2.0
 iniconfig==1.1.1
-ipdb==0.13.9
-ipython==7.16.3
-ipython-genutils==0.2.0
-jedi==0.17.2
--e git+https://github.com/escherba/python-metrohash@7df90e93a81300cead306e1b0dcd9ac178abcf44#egg=metrohash
-numpy==1.19.5
-packaging==21.3
-parso==0.7.1
+ipdb==0.13.11
+ipython==8.7.0
+jedi==0.18.2
+matplotlib-inline==0.1.6
+numpy==1.23.5
+packaging==22.0
+parso==0.8.3
 pexpect==4.8.0
 pickleshare==0.7.5
 pluggy==1.0.0
-prompt-toolkit==3.0.31
+prompt-toolkit==3.0.36
 ptyprocess==0.7.0
-py==1.11.0
-py-cpuinfo==8.0.0
+pure-eval==0.2.2
+py-cpuinfo==9.0.0
 Pygments==2.13.0
-pyparsing==3.0.9
-pytest==7.0.1
+pytest==7.2.0
 six==1.16.0
-toml==0.10.2
-tomli==1.2.3
-traitlets==4.3.3
-typing_extensions==4.1.1
+stack-data==0.6.2
+tomli==2.0.1
+traitlets==5.7.1
 wcwidth==0.2.5
-zipp==3.6.0

python.mk

@@ -18,7 +18,7 @@ PYVERSION := $(shell $(INTERPRETER) --version 2>&1)
 PYTHON := $(PYENV) $(INTERPRETER)
 PIP := $(PYENV) $(PACKAGE_MGR)
 
-VENV_OPTS := --python="$(shell which $(INTERPRETER))"
+VENV_OPTS := ""
 ifeq ($(PIP_SYSTEM_SITE_PACKAGES),1)
 VENV_OPTS += --system-site-packages
 endif
@@ -38,9 +38,9 @@ release: $(BUILD_STAMP) | $(ENV_STAMP)  ## upload package to PyPI (deprecated)
 	$(PYTHON) setup.py $(DISTRIBUTE) upload -r $(PYPI_URL)
 
 .PHONY: shell
-shell: build  ## open Python shell within the virtualenv
+shell: build  ## open Python shell within the virtual environment
 	@echo "Using $(PYVERSION)"
-	$(PYENV) ipython
+	$(PYENV) python
 
 .PHONY: build
 build: $(EXTENSION_OBJS)  ## build C extension(s)
@@ -81,8 +81,7 @@ install:  $(BUILD_STAMP)  ## install package
 .PHONY: env
 env: $(ENV_STAMP)  ## set up a virtual environment
 $(ENV_STAMP): 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)
+	test -f $@ || $(INTERPRETER) -m venv $(VENV_OPTS) env
 	$(PIP) install -U pip wheel
 	export SETUPTOOLS_USE_DISTUTILS=stdlib; $(PIP) install -r requirements.txt
 	$(PIP) freeze > pip-freeze.txt

setup.py

@@ -117,7 +117,7 @@ def get_system_bits():
     ),
 ]
 
-VERSION = "0.3.2"
+VERSION = "0.3.3"
 URL = "https://github.com/escherba/python-metrohash"
 
 
@@ -161,6 +161,7 @@ def get_long_description(relpath, encoding="utf-8"):
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "Topic :: Scientific/Engineering :: Information Analysis",
         "Topic :: Software Development :: Libraries",
         "Topic :: System :: Distributed Computing",

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.3.2"
+__version__ = "0.3.3"
 __all__     = [
     "MetroHash64",
     "MetroHash128",