Merge pull request #2 from emcek/add_313

Add Python 3.13
emcek · Oct 14, 2024 · d78705c · d78705c
2 parents 63cc22b + 4390f13
commit d78705c
Show file tree

Hide file tree

Showing 7 changed files with 113 additions and 186 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,6 +1,6 @@
 name: Continuous Integration
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
   build:
@@ -12,11 +12,11 @@ jobs:
       matrix:
         os:
           - windows-2019
-          - ubuntu-20.04
-          - macos-12
-          - macos-latest
+#          - ubuntu-20.04
+#          - macos-latest
         python-version:
           - "2.7"
+          - "3.13"
           - "3.12"
           - "3.11"
           - "3.10"
@@ -31,9 +31,9 @@ jobs:
           - "pypy-3.10"
         lua-version:
           - "bundle"
-          - "lua5.3"
-          - "lua5.2"
-          - "luajit-5.1"
+#          - "lua5.3"
+#          - "lua5.2"
+#          - "luajit-5.1"
 
         exclude:
           - os: windows-2019
@@ -49,8 +49,6 @@ jobs:
           - os: windows-2019
             lua-version: luajit-5.1
 
-          - os: macos-12
-            python-version: "2.7"
           - os: macos-latest
             python-version: "2.7"
           - os: macos-latest
@@ -60,14 +58,6 @@ jobs:
           - os: macos-latest
             python-version: pypy-3.7
 
-          - os: macos-12
-            lua-version: lua5.2
-          - os: macos-12
-            lua-version: lua5.3
-          - os: macos-12
-            lua-version: lua5.4
-          - os: macos-12
-            lua-version: luajit-5.1
           - os: macos-latest
             lua-version: lua5.2
           - os: macos-latest
@@ -124,24 +114,16 @@ jobs:
         arch: x64
 
     - name: Build wheel
-      run: python setup.py sdist ${{ contains(matrix.python-version, '3.') && 'build_ext -j6' || '' }} bdist_wheel
+      run: python setup.py ${{ contains(matrix.python-version, '3.') && 'build_ext -j6' || '' }} bdist_wheel
       env:
         SETUP_OPTIONS: ${{ !contains(matrix.lua-version, 'luajit') && (contains(matrix.lua-version, 'bundle') && '--use-bundle' || '--no-luajit') || '' }}
         CFLAGS: ${{ env.CFLAGS }} ${{ env.CFLAGS_LTO }}
         LDFLAGS: ${{ env.CFLAGS_LTO }}
 
     - name: Run tests
-      run: python setup.py test
+      run: python setup.py -q test
       continue-on-error: ${{ contains(matrix.python-version, 'pypy') }}
       env:
         SETUP_OPTIONS: ${{ !contains(matrix.lua-version, 'luajit') && (contains(matrix.lua-version, 'bundle') && '--use-bundle' || '--no-luajit') || '' }}
         CFLAGS: ${{ env.CFLAGS }} ${{ env.CFLAGS_LTO }}
         LDFLAGS: ${{ env.CFLAGS_LTO }}
-
-    - name: Upload wheels
-      if: matrix.lua-version == 'bundle' && matrix.os == 'macos-latest'
-      uses: actions/upload-artifact@v4
-      with:
-        name: wheels-${{ matrix.os }}-${{ matrix.python-version }}
-        path: dist/*.whl
-        if-no-files-found: ignore
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -3,14 +3,6 @@ name: Wheel build
 on:
   release:
     types: [created]
-  schedule:
-  #        ┌───────────── minute (0 - 59)
-  #        │  ┌───────────── hour (0 - 23)
-  #        │  │ ┌───────────── day of the month (1 - 31)
-  #        │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
-  #        │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
-  #        │  │ │ │ │
-  - cron: "42 3 * * 4"
   push:
     paths:
       - .github/workflows/wheels.yml
@@ -42,60 +34,43 @@ jobs:
   sdist:
     runs-on: ubuntu-20.04
 
-    permissions:
-      contents: write  # to create GitHub release (softprops/action-gh-release)
-
     steps:
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-
+    - uses: actions/checkout@v4
     - name: Check out recursively
       run: git submodule update --init --recursive
 
     - name: Set up Python
-      uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+      uses: actions/setup-python@v5
       with:
         python-version: "3.x"
 
     - name: Install Python dependencies
       run: python -m pip install -r requirements.txt
 
     - name: Build sdist
-      run: make sdist
+      run: python setup.py sdist
 
     - name: Upload sdist
-      uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6 # v4.2.0
+      uses: actions/upload-artifact@v4
       with:
         name: sdist
         path: dist/*.tar.gz
 
-    - name: Release
-      uses: softprops/action-gh-release@v2
-      if: startsWith(github.ref, 'refs/tags/')
-      with:
-        files: dist/*.tar.gz
-
   generate-wheels-matrix:
-    # Create a matrix of all architectures & versions to build.
-    # This enables the next step to run cibuildwheel in parallel.
-    # From https://iscinumpy.dev/post/cibuildwheel-2-10-0/#only-210
     name: Generate wheels matrix
     runs-on: ubuntu-latest
     outputs:
       include: ${{ steps.set-matrix.outputs.include }}
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/checkout@v4
       - name: Install cibuildwheel
         # Nb. keep cibuildwheel version pin consistent with job below
-        run: pipx install cibuildwheel==2.16.5
+        run: pipx install cibuildwheel==2.21.3
       - id: set-matrix
         run: |
           MATRIX=$(
             {
-              cibuildwheel --print-build-identifiers --platform linux \
-              | jq -nRc '{"only": inputs, "os": "ubuntu-latest"}' \
-              && cibuildwheel --print-build-identifiers --platform macos \
-              | jq -nRc '{"only": inputs, "os": "macos-latest"}' \
-              && cibuildwheel --print-build-identifiers --platform windows \
+              cibuildwheel --print-build-identifiers --platform windows \
               | jq -nRc '{"only": inputs, "os": "windows-2019"}'
             } | jq -sc
           )
@@ -117,7 +92,7 @@ jobs:
       LUPA_WITH_LUA_DLOPEN: ${{ startsWith(matrix.os, 'windows') && 'false' || 'true' }}
 
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/checkout@v4
 
       - name: Check out recursively
         run: git submodule update --init --recursive
@@ -147,147 +122,86 @@ jobs:
           arch: x86
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.16.5
+        uses: pypa/cibuildwheel@v2.21.3
         with:
           only: ${{ matrix.only }}
 
-      - uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6 # v4.2.0
+      - uses: actions/upload-artifact@v4
         with:
           path: ./wheelhouse/*.whl
           name: wheel-${{ matrix.only }}
 
   upload_release_assets:
     name: Upload Release Wheels
-    needs: [ build_wheels, Linux, non-Linux ]
+    needs: [ build_wheels, sdist ]
     runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags')
 
     permissions:
       contents: write  # to create GitHub release (softprops/action-gh-release)
 
     steps:
       - name: Download bdist files
-        uses: actions/download-artifact@6b208ae046db98c579e8a3aa621ab581ff575935 # v4.1.1
+        uses: actions/download-artifact@v4
         with:
           path: ./bdist_downloads
           merge-multiple: true
 
       - name: List downloaded artifacts
         run: ls -la ./bdist_downloads
 
-      - uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6 # v4.2.0
+      - uses: actions/upload-artifact@v4
         with:
           path: ./bdist_downloads/*.whl
           name: wheels
 
-      - name: Release
-        uses: softprops/action-gh-release@v2
-        with:
-          files: ./bdist_downloads/*.whl
-
-  Linux:
+  make_release:
+    name: Make Github release
+    needs: [ upload_release_assets ]
     runs-on: ubuntu-latest
 
-    strategy:
-      # Allows for matrix sub-jobs to fail without canceling the rest
-      fail-fast: false
-
-      matrix:
-        image:
-          - manylinux2014_x86_64
-          - manylinux2014_i686
-        pyversion: ["*"]
-
-        include:
-          - image: manylinux2014_aarch64
-            pyversion: "cp36*"
+    permissions:
+      contents: write  # to create GitHub release (softprops/action-gh-release)
 
     steps:
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-
-    - name: Check out recursively
-      run: git submodule update --init --recursive
-
-    - name: Set up Python
-      uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
-      with:
-        python-version: "3.9"
-
-    - name: Install dependencies
-      run: python -m pip install -r requirements.txt
-
-    - name: Build Linux wheels
-      run: make USE_BUNDLE=true sdist wheel_${{ matrix.image }}
-      env: { PYTHON_BUILD_VERSION: "${{ matrix.pyversion }}" }
-
-    - name: Upload wheels
-      uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6 # v4.2.0
-      with:
-        name: wheels-${{ matrix.image }}
-        path: wheelhouse_*/*-m*linux*.whl  # manylinux / musllinux
-        if-no-files-found: ignore
-
-  non-Linux:
-    strategy:
-      # Allows for matrix sub-jobs to fail without canceling the rest
-      fail-fast: false
+      - name: Download lupa wheels
+        uses: actions/download-artifact@v4
+        with:
+          name: wheels
+          path: dist
 
-      matrix:
-        os:
-          - macos-12
-          #- windows-2019
-        pyversion:
-          - "2.7"
-          - "3.6"
-          #- "pypy-3.7-v7.3.7"
-          #- "pypy-3.8-v7.3.7"
-          #- "pypy-3.9-v7.3.11"
-          #- "pypy-3.10-v7.3.13"
-
-        exclude:
-          # outdated compilers and probably not worth supporting anymore
-          - os: windows-2019
-            pyversion: "2.7"
+      - name: Download lupa sdist
+        uses: actions/download-artifact@v4
+        with:
+          name: sdist
+          path: dist
 
-    runs-on: ${{ matrix.os }}
-    env:
-      USE_BUNDLE: "true"
-      MACOSX_DEPLOYMENT_TARGET: "11.0"
-      LUPA_WITH_LUA_DLOPEN: ${{ startsWith(matrix.os, 'windows') && 'false' || 'true' }}
-      PYTHON_BIN_DIR: ${{ startsWith(matrix.pyversion, '2.') && '/Library/Frameworks/Python.framework/Versions/2.7/bin' || '' }}
+      - name: Release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: ./dist/*
 
+  pypi:
+    name: Upload release to PyPI
+    needs: [ upload_release_assets ]
+    runs-on: ubuntu-latest
+    environment:
+      name: pypi
+    permissions:
+      id-token: write
     steps:
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - name: Download lupa wheels
+        uses: actions/download-artifact@v4
+        with:
+          name: wheels
+          path: dist
 
-    - name: Check out recursively
-      run: git submodule update --init --recursive
+      - name: Download lupa sdist
+        uses: actions/download-artifact@v4
+        with:
+          name: sdist
+          path: dist
 
-    - name: Set up Python
-      uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
-      # macOS has Py2.7 installed system wide
-      if: matrix.pyversion != '2.7'
-      with:
-        python-version: ${{ matrix.pyversion }}
-
-    - name: Install MacOS dependencies
-      if: startsWith(matrix.os, 'mac')
-      run: |
-        brew install automake libtool
-        ln -s /usr/local/bin/glibtoolize /usr/local/bin/libtoolize
-
-    - name: Install dependencies
-      run: |
-        export PATH=$PYTHON_BIN_DIR:$PATH
-        python -m pip install wheel -r requirements.txt
-
-    - name: Build wheels
-      run: |
-        export PATH=$PYTHON_BIN_DIR:$PATH
-        python setup.py --with-cython sdist ${{ contains(matrix.pyversion, '3.') && 'build_ext -j6' || '' }} bdist_wheel
-
-    - name: Upload wheels
-      uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6 # v4.2.0
-      with:
-        name: wheels-${{ matrix.pyversion }}-${{ matrix.os }}
-        path: dist/*.whl
-        if-no-files-found: ignore
+      - name: Publish package distributions to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          repository-url: https://test.pypi.org/legacy/
diff --git a/README.rst b/README.rst
@@ -1,3 +1,23 @@
+pyLupa
+======
+This is a fork of the original `Lupa project`_, due to re-packaging reasons.
+All credits go to original author of Lupa: **Stefan Behnel**.
+
+All source code is untouched as in original repository, all issue and PR code
+related should be submit to `Lupa project`_.
+
+With this fork it is possible to take advantage of LuaJIT 2.1 under Windows,
+only one difference is package name:
+
+.. _`Lupa project`: https://github.com/scoder/lupa
+
+.. code:: python
+
+    import pylupa.luajit21 as lupa
+
+    print(f"Using {lupa.LuaRuntime().lua_implementation} (compiled with {lupa.LUA_VERSION})")
+
+
 Lupa
 ====