updated build process

Author: daimor

.github/workflows/python-publish.yml

@@ -20,13 +20,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
       if: github.event_name == 'push'
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
-        python-version: '3.x'
+        python-version: '3.10'
     - name: Install dependencies
       id: set-version
       run: |
@@ -35,38 +35,26 @@ jobs:
         [ $GITHUB_EVENT_NAME == 'push' ] && VERSION+=b && VERSION+=$(($(git tag -l "*$VERSION*" | cut -db -f2 | sort -n | tail -1)+1)) 
         sed -ie "s/version = .*/version = $VERSION/" setup.cfg
         python -m pip install --upgrade pip
+        pip install -r requirements.txt
         pip install build
         echo ::set-output name=version::$VERSION
         NAME="django_iris"-${VERSION}-py3-none-any
         echo ::set-output name=name::$NAME
     - name: Build package
-      run: python -m build
+      run: ./scripts/build-dist.sh
     - name: Publish package
-      uses: pypa/gh-action-pypi-publish@release/v1.5
+      uses: pypa/gh-action-pypi-publish@release/v1
       with:
         user: __token__
         password: ${{ secrets.PYPI_API_TOKEN }}
     - name: Create Beta Release
       id: create_release
-      if: github.event_name == 'push'
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      uses: softprops/action-gh-release@v1
       with:
-        tag_name: ${{ steps.set-version.outputs.version }}
-        release_name: ${{ steps.set-version.outputs.version }}
+        tag_name: v${{ steps.set-version.outputs.version }}
         prerelease: ${{ github.event_name != 'release' }}
-    - name: Upload Release Asset
-      id: upload-release-asset
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ github.event_name == 'release' && github.event.release.upload_url || steps.create_release.outputs.upload_url }}
-        asset_path: dist/${{ steps.set-version.outputs.name }}.whl
-        asset_name: ${{ steps.set-version.outputs.name }}.whl
-        asset_content_type: application/zip
-    - uses: actions/checkout@v2
+        files: dist/${{ steps.set-version.outputs.name }}.whl
+    - uses: actions/checkout@v3
       if: github.event_name == 'release'
       with:
         ref: main

requirements.txt

@@ -1 +1 @@
-https://github.com/intersystems-community/intersystems-irispython/releases/download/3.4.1/intersystems_iris-3.4.1-py3-none-any.whl
+https://github.com/intersystems-community/intersystems-irispython/releases/download/3.5.0/intersystems_iris-3.5.0-py3-none-any.whl

scripts/build-dist.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+packages=("intersystems_iris"  "irisnative")
+for package in ${packages[@]};
+do
+    rm -f ./$package
+    package_path=`python -c "import importlib.util; print(importlib.util.find_spec('${package}').submodule_search_locations[0])"`
+    ln -s $package_path ./$package
+done
+
+set -eo pipefail
+
+PROJECT="$( cd "$(dirname "$0")/.." ; pwd -P )"
+
+PYTHON_BIN=${PYTHON_BIN:-python3}
+
+echo "$PYTHON_BIN"
+
+set -x
+
+rm -rf "$PROJECT"/dist
+rm -rf "$PROJECT"/build
+mkdir -p "$PROJECT"/dist
+
+cd "$PROJECT"
+$PYTHON_BIN setup.py sdist bdist_wheel
+
+for package in ${packages[@]};
+do
+    rm -f $package
+done
+rm -rf intersystems-irispython
+
+set +x

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = django-iris
-version = 0.1.15
+version = 0.2.0
 url = https://github.com/caretdev/django-iris
 maintainer = CaretDev
 maintainer_email = [email protected]
@@ -26,4 +26,6 @@ project_urls =
 [options]
 packages = 
     django_iris
+    intersystems_iris
+    irisnative
 python_requires = >=3.8