Merge branch 'master' into python1

Author: gliptak

.github/workflows/pypy.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["pypy2.7", "pypy3.9", "pypy3.10"]
+        python-version: [pypy3.9, "pypy3.10"]
 
     name: ${{ matrix.python-version }}
 
@@ -25,15 +25,12 @@ jobs:
           architecture: x64
 
       - name: Install test dependencies
-        run: pip install cffi flake8 pytest wheel
-
-      - name: Install libsnappy-dev
-        run: sudo apt-get install libsnappy-dev
+        run: pip install flake8 pytest wheel
 
       # Flake8 is already run in Source Distribution (sdist) workflow, so we don't run it here.
 
       - name: Install python-snappy from source
-        run: pip install -e .
+        run: python setup.py develop
 
       - name: Pytest
-        run: pytest --verbose test_snappy.py test_snappy_cffi.py
+        run: pytest --verbose test_snappy.py

.github/workflows/wheel.yml

@@ -31,9 +31,6 @@ jobs:
           flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
           flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
 
-      - name: Install libsnappy-dev
-        run: sudo apt-get install libsnappy-dev
-
       - name: Generate source distribution
         run: python setup.py sdist
 
@@ -108,7 +105,8 @@ jobs:
           python -m pip install delvewheel==0.0.9
 
       - name: Build wheels
-        uses: joerick/cibuildwheel@v2.11.2
+        run: |
+          python -m pip wheel -w ./wheelhouse .
 
       - uses: actions/upload-artifact@v2
         with:

setup.py

@@ -38,30 +38,9 @@
 More details about Snappy library: http://google.github.io/snappy
 """
 
-library_dirs, include_dirs = [], []
-if os.environ.get("CIBUILDWHEEL", False) and sys.version_info[:2] == (3, 9) and sys.platform =="darwin":
-    library_dirs = ["/usr/local/lib/"]
-    include_dirs = ["/usr/local/include/"]
-
-
-snappymodule = Extension('snappy._snappy',
-                         libraries=['snappy'],
-                         sources=['src/snappy/snappymodule.cc', 'src/snappy/crc32c.c'],
-                         library_dirs=library_dirs,
-                         include_dirs=include_dirs)
-
-ext_modules = [snappymodule]
 packages = ['snappy']
-install_requires = []
-setup_requires = []
-cffi_modules = []
-
-if 'PyPy' in sys.version:
-    from setuptools import setup
-    ext_modules = []
-    install_requires = ['cffi>=1.15.0']
-    setup_requires = ['cffi>=1.15.0']
-    cffi_modules = ['./src/snappy/snappy_cffi_builder.py:ffi']
+install_requires = ['cramjam>=2.6.0', 'crc32c']
+setup_requires = ['cramjam>=2.6.0', 'crc32c']
 
 setup(
     name='python-snappy',
@@ -94,10 +73,8 @@
                  'Programming Language :: Python :: 3.10',
                  'Programming Language :: Python :: 3.11'
                  ],
-    ext_modules=ext_modules,
     packages=packages,
     install_requires=install_requires,
     setup_requires=setup_requires,
-    cffi_modules=cffi_modules,
     package_dir={'': 'src'},
 )