Merge pull request #7 from btclib-org/dev

Add support for pypy on macos

Author: giacomocaironi

.github/workflows/build.yml

@@ -33,6 +33,7 @@ jobs:
         run: |
           python setup.py sdist
           python setup.py bdist_wheel --plat-name=manylinux2010_x86_64 --py-limited-api=cp36
+          BTCLIB_LIBSECP256K1_DYNAMIC=true python setup.py bdist_wheel --plat-name=manylinux2010_x86_64 --py-limited-api=cp36
         # python setup.py bdist_wheel --plat-name=manylinux2010_x86_64
 
       - uses: actions/upload-artifact@v3
@@ -64,8 +65,9 @@ jobs:
         run: bash ./.github/scripts/install-macos-deps.sh
 
       - name: Build
-        run:
+        run: |
           python setup.py bdist_wheel --py-limited-api=cp36
+          BTCLIB_LIBSECP256K1_DYNAMIC=true python setup.py bdist_wheel --py-limited-api=cp36
           # python setup.py bdist_wheel --plat-name=macosx_11_x86_64
 
       - uses: actions/upload-artifact@v3

.github/workflows/test.yml

@@ -17,7 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.7", "3.8", "3.9", "3.10", "pypy-3.7"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "pypy-3.7", "pypy-3.8"]
     env:
       PYTHON_VERSION: ${{ matrix.python-version }}
       OS_NAME: ${{ matrix.os }}
@@ -30,10 +30,6 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install macos dependencies
-        if: startsWith(matrix.os, 'macos')
-        run: bash ./.github/scripts/install-macos-deps.sh
-
       - name: Upgrade Python packaging tools
         run: pip install --upgrade pip setuptools wheel
 

build.py

@@ -22,6 +22,7 @@
 
 windows = "--plat-name=win_amd64" in sys.argv or platform.system() == "Windows"
 static = bool(not windows and pathlib.Path(".git").exists())
+static = static and os.environ.get("BTCLIB_LIBSECP256K1_DYNAMIC", "false") != "true"
 secp256k1_dir = pathlib.Path(__file__).parent.resolve() / "secp256k1"
 libs_dir = secp256k1_dir / ".libs"
 include_dir = secp256k1_dir / "include"