From d62a08765cadbbabeeb7a0014c019dd5862f2a9f Mon Sep 17 00:00:00 2001 From: Grzegorz Bokota Date: Mon, 1 Feb 2021 18:29:20 +0100 Subject: [PATCH 1/7] build wheel using cibuildwheel work for linux and macos, initial for windows --- .github/workflows/sdist.yml | 60 --------- .github/workflows/wheel.yml | 123 +++++++++++------- MANIFEST.in | 2 +- build_snappy.sh | 25 ++++ setup.py | 9 +- {snappy => src/snappy}/__init__.py | 0 {snappy => src/snappy}/__main__.py | 0 {snappy => src/snappy}/crc32c.c | 0 {snappy => src/snappy}/crc32c.h | 0 {snappy => src/snappy}/hadoop_snappy.py | 0 {snappy => src/snappy}/snappy.py | 0 {snappy => src/snappy}/snappy_cffi.py | 0 {snappy => src/snappy}/snappy_cffi_builder.py | 0 {snappy => src/snappy}/snappy_formats.py | 0 {snappy => src/snappy}/snappymodule.cc | 0 15 files changed, 109 insertions(+), 110 deletions(-) delete mode 100644 .github/workflows/sdist.yml create mode 100644 build_snappy.sh rename {snappy => src/snappy}/__init__.py (100%) rename {snappy => src/snappy}/__main__.py (100%) rename {snappy => src/snappy}/crc32c.c (100%) rename {snappy => src/snappy}/crc32c.h (100%) rename {snappy => src/snappy}/hadoop_snappy.py (100%) rename {snappy => src/snappy}/snappy.py (100%) rename {snappy => src/snappy}/snappy_cffi.py (100%) rename {snappy => src/snappy}/snappy_cffi_builder.py (100%) rename {snappy => src/snappy}/snappy_formats.py (100%) rename {snappy => src/snappy}/snappymodule.cc (100%) diff --git a/.github/workflows/sdist.yml b/.github/workflows/sdist.yml deleted file mode 100644 index 8523d92..0000000 --- a/.github/workflows/sdist.yml +++ /dev/null @@ -1,60 +0,0 @@ -name: Source Distribution - -on: [push] - -jobs: - build: - runs-on: ubuntu-latest - - name: Python 3.9 - - steps: - - uses: actions/checkout@v2 - - - name: Setup Python - uses: actions/setup-python@v2 - with: - python-version: 3.9 - architecture: x64 - - - name: Install test dependencies - run: pip install wheel flake8 pytest twine - - - name: Flake8 - # stop the build if there are Python syntax errors or undefined names - # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide - run: | - 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 - - - name: Clean up sources - # this cleans up the sources to make sure `import snappy` uses the sdist - # an alternative would be to run pytest in a different working directory - run: rm -rf setup.py ./snappy - - - name: Install python-snappy sdist - run: pip install dist/python-snappy*.tar.gz - - - name: Pytest - run: pytest --verbose test_snappy.py - - - name: Archive sdist - if: startsWith(github.ref, 'refs/tags/0.') - uses: actions/upload-artifact@v2 - with: - name: python-snappy-sdist - path: dist/python-snappy*.tar.gz - - - name: Publish sdist to PyPI - if: startsWith(github.ref, 'refs/tags/0.') - env: - TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} - TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} - run: | - twine upload dist/python-snappy*.tar.gz diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml index a23d8c3..a459e74 100644 --- a/.github/workflows/wheel.yml +++ b/.github/workflows/wheel.yml @@ -1,34 +1,12 @@ -name: Wheel +name: PyPi wheel and sdist on: [push] jobs: - build: + sdist: runs-on: ubuntu-latest - strategy: - matrix: - include: - - python-version: 2.7 - pep-425-tag: cp27-cp27mu - # we build for "wide-unicode" CPython 2.7, which is prevalent among - # most Linux distributions. See https://github.com/pypa/manylinux - - - python-version: 3.5 - pep-425-tag: cp35-cp35m - - - python-version: 3.6 - pep-425-tag: cp36-cp36m - - python-version: 3.7 - pep-425-tag: cp37-cp37m - - - python-version: 3.8 - pep-425-tag: cp38-cp38 - - - python-version: 3.9 - pep-425-tag: cp39-cp39 - - name: Python ${{ matrix.python-version }} + name: Python 3.9 steps: - uses: actions/checkout@v2 @@ -36,44 +14,97 @@ jobs: - name: Setup Python uses: actions/setup-python@v2 with: - python-version: ${{ matrix.python-version }} + python-version: 3.9 architecture: x64 - name: Install test dependencies - run: pip install pytest twine + run: pip install wheel flake8 pytest - # Flake8 is already run in Source Distribution (sdist) workflow, so we don't run it here. + - name: Flake8 + # stop the build if there are Python syntax errors or undefined names + # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide + run: | + flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics + flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics - - name: Build python-snappy manylinux wheels - uses: RalfG/python-wheels-manylinux-build@v0.3.3-manylinux2010_x86_64 - with: - python-versions: ${{ matrix.pep-425-tag }} - system-packages: "snappy-devel" + - name: Install libsnappy-dev + run: sudo apt-get install libsnappy-dev - - name: Install python-snappy wheel - # manylinux1 offers broader compatibility than manylinux2010 or manylinux2014 - run: | - pip install dist/python_snappy*-manylinux1*.whl + - name: Generate source distribution + run: python setup.py sdist - - name: Clean up sources - # this cleans up the sources to make sure `import snappy` uses the wheel - # an alternative would be to run pytest in a different working directory - run: rm -rf setup.py ./snappy + - name: Install python-snappy sdist + run: pip install dist/python-snappy*.tar.gz - name: Pytest run: pytest --verbose test_snappy.py - - name: Archive wheels + - name: Archive sdist if: startsWith(github.ref, 'refs/tags/0.') uses: actions/upload-artifact@v2 with: - name: python_snappy-${{ matrix.pep-425-tag }}-manylinux - path: dist/python_snappy*-manylinux1*.whl + name: wheels + path: dist/python-snappy*.tar.gz + + build: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ubuntu-latest, macos-latest] # windows-latest + name: Python ${{ matrix.os }} + steps: + - uses: actions/checkout@v2 + + - name: Setup Python + uses: actions/setup-python@v2 + with: + python-version: "3.8" + + - name: Install Visual C++ for Python 2.7 + if: runner.os == 'Windows' + run: | + choco install vcpython27 -f -y + + - name: Add msbuild to PATH + if: runner.os == 'Windows' + uses: microsoft/setup-msbuild@v1.0.2 + + - name: Install cibuildwheel + run: | + python -m pip install cibuildwheel==1.8.0 + + - name: Build wheels + run: | + python -m cibuildwheel --output-dir wheelhouse + env: + CIBW_TEST_REQUIRES: pytest + CIBW_TEST_COMMAND: "python -m pytest --verbose {project}/test_snappy.py" + CIBW_BEFORE_ALL_LINUX: yum install -y snappy-devel + CIBW_BEFORE_ALL: "bash {project}/build_snappy.sh" + MACOSX_DEPLOYMENT_TARGET: "10.9" + CIBW_SKIP: "*2*win*" + CIBW_ENVIRONMENT_WINDOWS: INCLUDE="C:/Program Files (x86)/Snappy/include":$INCLUDE + + - uses: actions/upload-artifact@v2 + with: + path: ./wheelhouse/*.whl + name: wheels + + upload: + runs-on: ubuntu-latest + name: upload wheels + needs: ['sdist', 'build'] + if: startsWith(github.ref, 'refs/tags/0.') + steps: + - name: Download test data + uses: actions/download-artifact@v1 + with: + name: wheels - name: Publish wheels to PyPI - if: startsWith(github.ref, 'refs/tags/0.') env: TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} run: | - twine upload dist/python_snappy*-manylinux1*.whl + twine upload dist/*.whl diff --git a/MANIFEST.in b/MANIFEST.in index 364e64a..2c0b6f2 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1 +1 @@ -include *.py AUTHORS README.rst snappy/*.h MANIFEST.in LICENSE +include *.py AUTHORS README.rst src/snappy/*.h MANIFEST.in LICENSE diff --git a/build_snappy.sh b/build_snappy.sh new file mode 100644 index 0000000..0946d6f --- /dev/null +++ b/build_snappy.sh @@ -0,0 +1,25 @@ +git clone --depth 1 --branch 1.1.8 https://github.com/google/snappy snappy-src +cd snappy-src +git submodule update --init + + +case "$(uname -s)" in + CYGWIN*|MINGW32*|MSYS*|MINGW*) + cmake -G "Visual Studio 16 2019" -A Win32 -S . -B "build32" + cmake -G "Visual Studio 16 2019" -A x64 -S . -B "build64" + cmake --build build32 --config Release --target install + cmake --build build64 --config Release --target install + ;; + + # Add here more strings to compare + # See correspondence table at the bottom of this answer + + *) + cmake -S . -B "build" + cmake --build build --config Release --target install + ;; +esac + + + + diff --git a/setup.py b/setup.py index 6f782e5..102f20d 100644 --- a/setup.py +++ b/setup.py @@ -39,7 +39,7 @@ snappymodule = Extension('snappy._snappy', libraries=['snappy'], - sources=['snappy/snappymodule.cc', 'snappy/crc32c.c']) + sources=['src/snappy/snappymodule.cc', 'src/snappy/crc32c.c']) ext_modules = [snappymodule] packages = ['snappy'] @@ -52,7 +52,7 @@ ext_modules = [] install_requires = ['cffi>=1.0.0'] setup_requires = ['cffi>=1.0.0'] - cffi_modules = ['./snappy/snappy_cffi_builder.py:ffi'] + cffi_modules = ['./src/snappy/snappy_cffi_builder.py:ffi'] setup( name='python-snappy', @@ -80,10 +80,13 @@ 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9,' ], ext_modules=ext_modules, packages=packages, install_requires=install_requires, setup_requires=setup_requires, - cffi_modules=cffi_modules + cffi_modules=cffi_modules, + package_dir={'': 'src'}, ) diff --git a/snappy/__init__.py b/src/snappy/__init__.py similarity index 100% rename from snappy/__init__.py rename to src/snappy/__init__.py diff --git a/snappy/__main__.py b/src/snappy/__main__.py similarity index 100% rename from snappy/__main__.py rename to src/snappy/__main__.py diff --git a/snappy/crc32c.c b/src/snappy/crc32c.c similarity index 100% rename from snappy/crc32c.c rename to src/snappy/crc32c.c diff --git a/snappy/crc32c.h b/src/snappy/crc32c.h similarity index 100% rename from snappy/crc32c.h rename to src/snappy/crc32c.h diff --git a/snappy/hadoop_snappy.py b/src/snappy/hadoop_snappy.py similarity index 100% rename from snappy/hadoop_snappy.py rename to src/snappy/hadoop_snappy.py diff --git a/snappy/snappy.py b/src/snappy/snappy.py similarity index 100% rename from snappy/snappy.py rename to src/snappy/snappy.py diff --git a/snappy/snappy_cffi.py b/src/snappy/snappy_cffi.py similarity index 100% rename from snappy/snappy_cffi.py rename to src/snappy/snappy_cffi.py diff --git a/snappy/snappy_cffi_builder.py b/src/snappy/snappy_cffi_builder.py similarity index 100% rename from snappy/snappy_cffi_builder.py rename to src/snappy/snappy_cffi_builder.py diff --git a/snappy/snappy_formats.py b/src/snappy/snappy_formats.py similarity index 100% rename from snappy/snappy_formats.py rename to src/snappy/snappy_formats.py diff --git a/snappy/snappymodule.cc b/src/snappy/snappymodule.cc similarity index 100% rename from snappy/snappymodule.cc rename to src/snappy/snappymodule.cc From 335a8054d37e38fbf66f4f3e1a016b4e740837c3 Mon Sep 17 00:00:00 2001 From: Grzegorz Bokota Date: Mon, 1 Feb 2021 18:51:28 +0100 Subject: [PATCH 2/7] add pull_request build --- .github/workflows/wheel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml index a459e74..c19f5e1 100644 --- a/.github/workflows/wheel.yml +++ b/.github/workflows/wheel.yml @@ -1,6 +1,6 @@ name: PyPi wheel and sdist -on: [push] +on: [push, pull_request] jobs: sdist: From 538f8e7d14b079e3f20b5a1fa1f5ac4f91a46cff Mon Sep 17 00:00:00 2001 From: Grzegorz Bokota Date: Tue, 2 Feb 2021 19:02:30 +0100 Subject: [PATCH 3/7] Add windows wheelbuild --- .github/workflows/wheel.yml | 43 ++++++++++++++++++++++++++----------- setup.py | 6 ++++++ 2 files changed, 36 insertions(+), 13 deletions(-) diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml index c19f5e1..9ac0c16 100644 --- a/.github/workflows/wheel.yml +++ b/.github/workflows/wheel.yml @@ -51,9 +51,28 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest] # windows-latest + os: [ubuntu-latest, macos-latest, windows-latest] + architecture: ['x64'] + include: + - os: windows-latest + architecture: 'x86' + CIBW_SKIP: "*2*win* *win_amd64" + CIBW_ENVIRONMENT_WINDOWS: INCLUDE="C:/Program Files (x86)/Snappy/include" LIB="C:/Program Files (x86)/Snappy/lib" + - os: windows-latest + architecture: 'x64' + CIBW_SKIP: "*2*win* *win32" + CIBW_ENVIRONMENT_WINDOWS: INCLUDE="C:/Program Files/Snappy/include" LIB="C:/Program Files/Snappy/lib" name: Python ${{ matrix.os }} + env: + CIBW_TEST_REQUIRES: pytest + CIBW_TEST_COMMAND: "python -m pytest --verbose {project}/test_snappy.py" + CIBW_BEFORE_ALL_LINUX: yum install -y snappy-devel + MACOSX_DEPLOYMENT_TARGET: "10.9" + CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair -w {dest_dir} {wheel}" + CIBW_BEFORE_ALL: "bash {project}/build_snappy.sh" + CIBW_SKIP: ${{ matrix.CIBW_SKIP }} + CIBW_ENVIRONMENT_WINDOWS: ${{ matrix.CIBW_ENVIRONMENT_WINDOWS }} steps: - uses: actions/checkout@v2 @@ -61,11 +80,12 @@ jobs: uses: actions/setup-python@v2 with: python-version: "3.8" + architecture: ${{ matrix.architecture }} - - name: Install Visual C++ for Python 2.7 - if: runner.os == 'Windows' - run: | - choco install vcpython27 -f -y +# - name: Install Visual C++ for Python 2.7 +# if: runner.os == 'Windows' +# run: | +# choco install vcpython27 -f -y - name: Add msbuild to PATH if: runner.os == 'Windows' @@ -75,17 +95,14 @@ jobs: run: | python -m pip install cibuildwheel==1.8.0 + - name: delvewheel install + if: runner.os == 'Windows' + run: | + python -m pip install delvewheel==0.0.9 + - name: Build wheels run: | python -m cibuildwheel --output-dir wheelhouse - env: - CIBW_TEST_REQUIRES: pytest - CIBW_TEST_COMMAND: "python -m pytest --verbose {project}/test_snappy.py" - CIBW_BEFORE_ALL_LINUX: yum install -y snappy-devel - CIBW_BEFORE_ALL: "bash {project}/build_snappy.sh" - MACOSX_DEPLOYMENT_TARGET: "10.9" - CIBW_SKIP: "*2*win*" - CIBW_ENVIRONMENT_WINDOWS: INCLUDE="C:/Program Files (x86)/Snappy/include":$INCLUDE - uses: actions/upload-artifact@v2 with: diff --git a/setup.py b/setup.py index 102f20d..f679963 100644 --- a/setup.py +++ b/setup.py @@ -29,6 +29,12 @@ except ImportError: from distutils.core import setup, Extension +import os + +sys.stderr.write("#" * 100 + "\n") +sys.stderr.write(os.environ.get("LIBPATH", "libpath not found") + "\n") +sys.stderr.write("#" * 100 + "\n") + version = '0.6.0' long_description = """ Python bindings for the snappy compression library from Google. From d975cc41f620e862927af69987809083cb86a37f Mon Sep 17 00:00:00 2001 From: Grzegorz Bokota Date: Mon, 8 Feb 2021 17:21:22 +0100 Subject: [PATCH 4/7] bump cibuildwheel --- .github/workflows/wheel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml index 9ac0c16..d6ea821 100644 --- a/.github/workflows/wheel.yml +++ b/.github/workflows/wheel.yml @@ -93,7 +93,7 @@ jobs: - name: Install cibuildwheel run: | - python -m pip install cibuildwheel==1.8.0 + python -m pip install cibuildwheel==1.9.0 - name: delvewheel install if: runner.os == 'Windows' From c174cdc210a84e0768f08fc97d863b13b6fa34d0 Mon Sep 17 00:00:00 2001 From: Grzegorz Bokota Date: Mon, 8 Feb 2021 18:03:36 +0100 Subject: [PATCH 5/7] try linux multiple archs split linux build on two jobs --- .github/workflows/wheel.yml | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml index d6ea821..e418a60 100644 --- a/.github/workflows/wheel.yml +++ b/.github/workflows/wheel.yml @@ -51,17 +51,21 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, macos-latest, windows-2019] architecture: ['x64'] + linux_archs: ["auto s390x"] include: - - os: windows-latest + - os: windows-2019 architecture: 'x86' - CIBW_SKIP: "*2*win* *win_amd64" - CIBW_ENVIRONMENT_WINDOWS: INCLUDE="C:/Program Files (x86)/Snappy/include" LIB="C:/Program Files (x86)/Snappy/lib" - - os: windows-latest + skip: "*2*win* *win_amd64" + environment_windows: INCLUDE="C:/Program Files (x86)/Snappy/include" LIB="C:/Program Files (x86)/Snappy/lib" + - os: windows-2019 architecture: 'x64' - CIBW_SKIP: "*2*win* *win32" - CIBW_ENVIRONMENT_WINDOWS: INCLUDE="C:/Program Files/Snappy/include" LIB="C:/Program Files/Snappy/lib" + skip: "*2*win* *win32" + environment_windows: INCLUDE="C:/Program Files/Snappy/include" LIB="C:/Program Files/Snappy/lib" + - os: ubuntu-20.04 + architecture: 'x64' + linux_archs: aarch64 ppc64le name: Python ${{ matrix.os }} env: @@ -71,8 +75,9 @@ jobs: MACOSX_DEPLOYMENT_TARGET: "10.9" CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair -w {dest_dir} {wheel}" CIBW_BEFORE_ALL: "bash {project}/build_snappy.sh" - CIBW_SKIP: ${{ matrix.CIBW_SKIP }} - CIBW_ENVIRONMENT_WINDOWS: ${{ matrix.CIBW_ENVIRONMENT_WINDOWS }} + CIBW_SKIP: ${{ matrix.skip }} + CIBW_ENVIRONMENT_WINDOWS: ${{ matrix.environment_windows }} + CIBW_ARCHS_LINUX: ${{ matrix.linux_archs }} steps: - uses: actions/checkout@v2 @@ -86,23 +91,25 @@ jobs: # if: runner.os == 'Windows' # run: | # choco install vcpython27 -f -y + + + - name: Set up QEMU + if: runner.os == 'Linux' + uses: docker/setup-qemu-action@v1 + with: + platforms: all - name: Add msbuild to PATH if: runner.os == 'Windows' uses: microsoft/setup-msbuild@v1.0.2 - - name: Install cibuildwheel - run: | - python -m pip install cibuildwheel==1.9.0 - - name: delvewheel install if: runner.os == 'Windows' run: | python -m pip install delvewheel==0.0.9 - name: Build wheels - run: | - python -m cibuildwheel --output-dir wheelhouse + uses: joerick/cibuildwheel@v1.9.0 - uses: actions/upload-artifact@v2 with: From 9eb43ab382ebe88935f5e80ec0511449abcc2ba5 Mon Sep 17 00:00:00 2001 From: Grzegorz Bokota Date: Mon, 8 Feb 2021 19:47:46 +0100 Subject: [PATCH 6/7] set building macos universal wheel --- .github/workflows/wheel.yml | 4 +++- build_snappy.sh | 4 ++-- setup.py | 9 ++++++++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml index e418a60..4f502ea 100644 --- a/.github/workflows/wheel.yml +++ b/.github/workflows/wheel.yml @@ -51,7 +51,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest, windows-2019] + os: [ubuntu-20.04, macos-10.15, windows-2019] architecture: ['x64'] linux_archs: ["auto s390x"] include: @@ -78,6 +78,8 @@ jobs: CIBW_SKIP: ${{ matrix.skip }} CIBW_ENVIRONMENT_WINDOWS: ${{ matrix.environment_windows }} CIBW_ARCHS_LINUX: ${{ matrix.linux_archs }} + CIBW_ARCHS_MACOS: x86_64 universal2 + CIBW_TEST_SKIP: "*_arm64 *_universal2:arm64" steps: - uses: actions/checkout@v2 diff --git a/build_snappy.sh b/build_snappy.sh index 0946d6f..a2e0bc5 100644 --- a/build_snappy.sh +++ b/build_snappy.sh @@ -15,8 +15,8 @@ case "$(uname -s)" in # See correspondence table at the bottom of this answer *) - cmake -S . -B "build" - cmake --build build --config Release --target install + cmake -S . -B "build" -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" + cmake --build build --config Release --target install ;; esac diff --git a/setup.py b/setup.py index f679963..ac6ea2d 100644 --- a/setup.py +++ b/setup.py @@ -42,10 +42,17 @@ 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']) + sources=['src/snappy/snappymodule.cc', 'src/snappy/crc32c.c'], + library_dirs=library_dirs, + include_dirs=include_dirs) ext_modules = [snappymodule] packages = ['snappy'] From 3c446f55adb8d3d0bb238538fa9ee5f0088c8f3d Mon Sep 17 00:00:00 2001 From: Grzegorz Bokota Date: Mon, 8 Feb 2021 19:54:35 +0100 Subject: [PATCH 7/7] clean --- .github/workflows/wheel.yml | 1 - setup.py | 4 ---- 2 files changed, 5 deletions(-) diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml index 4f502ea..b22f6b1 100644 --- a/.github/workflows/wheel.yml +++ b/.github/workflows/wheel.yml @@ -40,7 +40,6 @@ jobs: run: pytest --verbose test_snappy.py - name: Archive sdist - if: startsWith(github.ref, 'refs/tags/0.') uses: actions/upload-artifact@v2 with: name: wheels diff --git a/setup.py b/setup.py index ac6ea2d..68a1cd1 100644 --- a/setup.py +++ b/setup.py @@ -31,10 +31,6 @@ import os -sys.stderr.write("#" * 100 + "\n") -sys.stderr.write(os.environ.get("LIBPATH", "libpath not found") + "\n") -sys.stderr.write("#" * 100 + "\n") - version = '0.6.0' long_description = """ Python bindings for the snappy compression library from Google.