Merge branch 'main' of https://github.com/caretdev/django-iris into DPP-412796

Author: nmitchko

.github/workflows/python-publish.yml

@@ -11,6 +11,8 @@ name: Upload Python Package
 on:
   release:
     types: [published]
+  push:
+    branches: [main]
 
 jobs:
   deploy:
@@ -19,20 +21,63 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+    - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
+      if: github.event_name == 'push'
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
         python-version: '3.x'
     - name: Install dependencies
+      id: set-version
       run: |
-        VERSION=${{ github.event.release.tag_name }}
+        VERSION=$(grep version setup.cfg | cut -d=  -f2 | tr -d '[:blank:]')
+        [ $GITHUB_EVENT_NAME == 'release' ] && VERSION=${{ github.event.release.tag_name }} && VERSION=${VERSION/v/}
+        [ $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 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
     - name: Publish package
       uses: pypa/gh-action-pypi-publish@release/v1.5
       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 }}
+      with:
+        tag_name: ${{ steps.set-version.outputs.version }}
+        release_name: ${{ 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
+      if: github.event_name == 'release'
+      with:
+        ref: main
+    - name: Bump version
+      if: github.event_name == 'release'
+      run: |
+        git config --global user.name 'ProjectBot'
+        git config --global user.email '[email protected]'
+        VERSION=${{ github.event.release.tag_name }} && VERSION=${VERSION/v/}
+        VERSION=`echo $VERSION | awk -F. '/[0-9]+\./{$NF++;print}' OFS=.`
+        sed -ie "s/version = .*/version = $VERSION/" setup.cfg
+        git add setup.cfg
+        git commit -m 'auto bump version with release'
+        git push

.gitignore

@@ -1,3 +1,7 @@
+/demo
+/*settings.py
+/.vscode
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

requirements.txt

@@ -1,2 +1 @@
-intersystems_irispython
--e git+https://github.com/intersystems-community/iris-driver-distribution/raw/main/intersystems_irispython-3.2.0-py3-none-any.whl
+https://github.com/intersystems-community/iris-driver-distribution/raw/main/intersystems_irispython-3.2.0-py3-none-any.whl

setup.py

@@ -1,13 +1,17 @@
-import re
 from setuptools import setup
+import os
+
+thelibFolder = os.path.dirname(os.path.realpath(__file__))
+requirementPath = thelibFolder + '/requirements.txt'
 
 requirements, dependency_links = [], []
-with open('requirements.txt') as f:
-    for line in f.read().splitlines():
-        if line.startswith('-e git+'):
-            dependency_links.append(line.replace('-e git+', ''))
-        else:
-            requirements.append(line)
+if os.path.isfile(requirementPath):
+    with open('./requirements.txt') as f:
+        for line in f.read().splitlines():
+            if line.startswith('http'):
+                dependency_links.append(line)
+            else:
+                requirements.append(line)
 
 setup(install_requires=requirements,
         dependency_links=dependency_links)