Add benchmarks

.bumpversion.cfg

@@ -1,11 +1,11 @@
 [bumpversion]
-current_version = 1.2.3
+current_version = 2.0.0
 commit = True
 tag = True
 
 [bumpversion:file:setup.py]
 
-[bumpversion:file:jaydebeapi/__init__.py]
+[bumpversion:file:jaydebeapiarrow/__init__.py]
 serialize = {major}, {minor}, {patch}
 parse = (?P<major>\d+), (?P<minor>\d+), (?P<patch>\d+)
 

.github/workflows/publish.yml

@@ -6,26 +6,104 @@ name: Upload Python Package
 on:
   release:
     types: [created]
+  workflow_dispatch:
 
 jobs:
-  deploy:
+  build:
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
+    - name: Set up JDK
+      uses: actions/setup-java@v3
+      with:
+        java-version: '8'
+        distribution: 'temurin'
+        cache: maven
+    - name: Build with Maven
+      run: |
+        cd ./arrow-jdbc-extension && mvn clean compile assembly:single && cd ..
+        cp ./arrow-jdbc-extension/target/arrow-jdbc*.jar ./jaydebeapiarrow/lib
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: '3.x'
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
-        pip install setuptools wheel twine
-    - name: Build and publish
-      env:
-        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-      run: |
-        python setup.py sdist bdist_wheel --universal
-        twine upload dist/*
+        python3 -m pip install --upgrade pip
+        python3 -m pip install setuptools build
+    - name: Build wheel and tarball
+      run: python3 -m build
+    - name: Store artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: python-package-distributions
+        path: dist/
+
+  publish-to-testpypi:
+    name: Publish Python distribution to TestPyPI
+    needs:
+    - build
+    runs-on: ubuntu-latest
+
+    environment:
+      name: testpypi
+      url: https://test.pypi.org/p/JayDeBeApiArrow
+
+    permissions:
+      id-token: write  # IMPORTANT: mandatory for trusted publishing
+
+    steps:
+    - name: Download all the dists
+      uses: actions/download-artifact@v4
+      with:
+        name: python-package-distributions
+        path: dist/
+    - name: Publish distribution to TestPyPI
+      uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        repository-url: https://test.pypi.org/legacy/
+
+  # github-release:
+  #   name: >-
+  #     Sign the Python distribution with Sigstore
+  #     and upload them to GitHub Release
+  #   needs:
+  #   - publish-to-testpypi
+  #   runs-on: ubuntu-latest
+
+  #   permissions:
+  #     contents: write  # IMPORTANT: mandatory for making GitHub Releases
+  #     id-token: write  # IMPORTANT: mandatory for sigstore
+
+  #   steps:
+  #   - name: Download all the dists
+  #     uses: actions/download-artifact@v4
+  #     with:
+  #       name: python-package-distributions
+  #       path: dist/
+  #   - name: Sign the dists with Sigstore
+  #     uses: sigstore/gh-action-sigstore-python@v1.2.3
+  #     with:
+  #       inputs: >-
+  #         ./dist/*.tar.gz
+  #         ./dist/*.whl
+  #   - name: Create GitHub Release
+  #     env:
+  #       GITHUB_TOKEN: ${{ github.token }}
+  #     run: >-
+  #       gh release create
+  #       '${{ github.ref_name }}'
+  #       --repo '${{ github.repository }}'
+  #       --notes ""
+  #   - name: Upload artifact signatures to GitHub Release
+  #     env:
+  #       GITHUB_TOKEN: ${{ github.token }}
+  #     # Upload to GitHub Release using the `gh` CLI.
+  #     # `dist/` contains the built packages, and the
+  #     # sigstore-produced signatures and certificates.
+  #     run: >-
+  #       gh release upload
+  #       '${{ github.ref_name }}' dist/**
+  #       --repo '${{ github.repository }}'

.github/workflows/tests.yml

@@ -5,78 +5,92 @@ name: tests
 
 on:
   push:
-    branches: [ master ]
   pull_request:
     branches: [ master ]
 
 jobs:
   test:
 
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      checks: write
     strategy:
       matrix:
-        python-version: [2.7, 3.5, 3.6, 3.8]
+        python-version: [3.9, 3.11]
         plattform: ["Python"]
-        include:
-          - python-version: 3.8
-            plattform: "Jython"
-            jython: org.python:jython-installer:2.7.2
-            toxenv: "jython-driver-{hsqldb,mock}"
+
+    services:
+      postgres:
+        image: postgres:14
+        env:
+          POSTGRES_DB: test_db
+          POSTGRES_PASSWORD: password
+          POSTGRES_USER: user
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+      mysql:
+        image: mysql:8.0
+        env:
+          MYSQL_DATABASE: test_db
+          MYSQL_USER: user
+          MYSQL_PASSWORD: password
+          MYSQL_ROOT_PASSWORD: password
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Maven cache
-      uses: actions/cache@v1
+      uses: actions/cache@v3
       with:
         path: .tox/shared/.m2
         key: ${{ matrix.plattform }}-${{ matrix.python-version }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           ${{ matrix.plattform }}-${{ matrix.python-version }}-maven-
     - name: Pip cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/.cache/pip
         key: ${{ matrix.plattform }}-${{ matrix.python-version }}-pip-${{ hashFiles('**/*requirements.txt', 'tox.ini', 'setup.py') }}
         restore-keys: |
           ${{ matrix.plattform }}-${{ matrix.python-version }}-pip-
-    - name: Jython installation cache
-      uses: actions/cache@v2
-      with:
-        path: ~/jython
-        key: ${{ matrix.jython }}-jython
-      if: matrix.jython
 
-    - name: Consider Jython
-      run: |
-        ci/before_install_jython.sh
-      if: matrix.jython
-      env:
-        JYTHON: ${{ matrix.jython }}
     - name: Install dependencies
-      # for some reason installing from https://github.com/baztian/tox-gh-actions/archive/allow-env-override.tar.gz doesn't work
-      run: pip install coveralls tox git+https://github.com/baztian/tox-gh-actions.git@allow-env-override
-    - name: Test with tox for Jython only
-      if: matrix.jython
-      run: tox -e "${{ matrix.toxenv }}"
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install coveralls tox tox-gh-actions
     - name: Test with tox for non Jython only
-      if: ${{ ! matrix.jython }}
       run: tox
-    - name: Coveralls
-      uses: baztian/coveralls-python-action@new-merged-changes
-      with:
-        parallel: true
-        flag-name: ${{ matrix.plattform }}-${{ matrix.python-version }}
-        coverage-version: 4.5.4
-
-  coveralls_finish:
-    needs: test
-    runs-on: ubuntu-latest
-    steps:
-    - name: Coveralls Finished
-      uses: baztian/coveralls-python-action@new-merged-changes
+    - name: Publish Test Report
+      uses: mikepenz/action-junit-report@v4
+      if: always() # always run even if tests fail
       with:
-        parallel-finished: true
+        report_paths: '**/build/test-reports/*.xml'
+        detailed_summary: true
+        include_passed: true
+#    - name: Coveralls
+#      uses: baztian/coveralls-python-action@new-merged-changes
+#      with:
+#        parallel: true
+#        flag-name: ${{ matrix.plattform }}-${{ matrix.python-version }}
+#        coverage-version: 4.5.4
+#
+#  coveralls_finish:
+#    needs: test
+#    runs-on: ubuntu-latest
+#    steps:
+#    - name: Coveralls Finished
+#      uses: baztian/coveralls-python-action@new-merged-changes
+#      with:
+#        parallel-finished: true

.gitignore

@@ -12,6 +12,7 @@ env/
 mem.*
 *.log
 JayDeBeApi.egg-info
+JayDeBeApiArrow.egg-info
 target/
 .classpath
 .project
@@ -22,3 +23,9 @@ target/
 .settings/
 .jython_cache/
 .vscode/
+jars/
+*.DS_Store
+*/jars
+*/lib/*.jar
+benchmark/results/
+benchmark/profiles/

MANIFEST.in

@@ -1,3 +1,4 @@
-recursive-include src/test *.py *.sql
+recursive-include test/ *.py *.sql
+recursive-include jaydebeapiarrow/ arrow-jdbc-extension*.jar
 prune *~
 include README*.rst COPYING*