move to pyproject.toml + update CI

.github/dependabot.yml

@@ -0,0 +1,13 @@
+version: 2
+updates:
+  - package-ecosystem: pip
+    directory: "/requirements"
+    schedule:
+      interval: monthly
+      time: "04:00"
+      timezone: Europe/Paris
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"

.github/workflows/release.yml

@@ -1,45 +1,76 @@
-
-name: Release
+name: Run tests and release
 
 on:
-  release: 
-    types:
-      - published 
+  push:
+    tags:
+      - "*"
+  workflow_dispatch:
+  workflow_call:
+
+env:
+  PROJECT_FOLDER: "pirogue"
+  PYTHON_VERSION_RELEASE: "3.9"
+  PIROGUE_VERSION: ${{ github.ref_name }}
 
 jobs:
-  release:
-    name: Deploy to PyPi
+  tests:
+    name: "Tests"
+    uses: ./.github/workflows/test.yml
+    secrets: inherit
+
+  build-python-wheel:
+    name: "🐍 Python Wheel"
+    uses: ./.github/workflows/wheel.yml
+    secrets: inherit
+
+  release-gh:
+    name: "Release on tag 🚀"
+    runs-on: ubuntu-latest
+    needs: [build-python-wheel, tests]
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+
+    steps:
+      - name: Retrieve artifact from Python build
+        uses: actions/download-artifact@v3
+        with:
+          name: python_wheel
+          path: dist/
+
+      - name: Create/update release on GitHub
+        uses: ncipollo/[email protected]
+        with:
+          allowUpdates: true
+          artifacts: "builds**/*"
+          generateReleaseNotes: true
+          omitNameDuringUpdate: true
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+  release-pypi:
+    name: "🐍 Release on PyPI"
     runs-on: ubuntu-latest
+    needs: [build-python-wheel, tests]
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
 
     steps:
-    - uses: actions/checkout@v2
-
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.8
-
-    - name: Install requirements
-      run: |
-        pip install -r requirements.txt
-
-    - name: Cache pip
-      uses: actions/cache@v2
-      with:
-        path: ~/.cache/pip
-        key: pip-${{ hashFiles('requirements.txt') }}
-        restore-keys: |
-          pip-
-
-    - name: Setup pirogue
-      run: |
-        VERSION=${GITHUB_REF:-0.0.0}
-        VERSION=${VERSION##*/}
-        sed -i "s/__VERSION__/${VERSION}/g" setup.py
-        python setup.py install sdist
-        pirogue -v
-    - name: Deploy to PyPI
-      uses: pypa/gh-action-pypi-publish@master
-      with:
-        user: __token__
-        password: ${{ secrets.PYPI_API_TOKEN }}
+      - name: Retrieve artifact from Python build
+        uses: actions/download-artifact@v3
+        with:
+          name: python_wheel
+          path: dist/
+
+      # -- FROM HERE, A TAG IS REQUIRED ---
+      - name: Deploy to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+
+        with:
+          user: __token__
+          password: ${{ secrets.PYPI_API_TOKEN }}
+
+      - name: Create/update release on GitHub
+        uses: ncipollo/[email protected]
+        with:
+          allowUpdates: true
+          artifacts: "dist/*.tar.gz"
+          generateReleaseNotes: true
+          omitNameDuringUpdate: true
+          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yml

@@ -7,6 +7,9 @@ on:
   pull_request:
     branches:
       - master
+  workflow_dispatch:
+  workflow_call:
+
 
 jobs:
   test:
@@ -42,45 +45,33 @@ jobs:
       PGUSER: postgres
 
     steps:
-    - uses: actions/checkout@v2
-
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.8
+      - name: Get source code
+        uses: actions/checkout@v4
 
-    - name: Install requirements
-      run: |
-        pip install -r requirements.txt
-        pip install -r test/requirements.txt
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.8"
+          cache: "pip"
+          cache-dependency-path: "requirements*.txt"
 
-    - name: Cache pip
-      uses: actions/cache@v2
-      with:
-        path: ~/.cache/pip
-        key: pip-${{ hashFiles('requirements.txt') }}-${{ hashFiles('test/requirements.txt') }}
-        restore-keys: |
-          pip-${{ hashFiles('requirements.txt') }}
-          pip-
+      - name: Install requirements
+        run: |
+          pip install -r requirements.txt
+          pip install -r requirements-test.txt
 
-    - name: Setup pirogue
-      run: |
-        VERSION=${GITHUB_REF:-0.0.0}
-        VERSION=${VERSION##*/}
-        sed -i "s/__VERSION__/${VERSION}/g" setup.py
-        python setup.py install
-        pirogue -v
+      - name: Install pirogue
+        run: python -m pip install -e .
 
-    - name: Setup tests
-      run: |
-        printf "[pirogue_test]\nhost=localhost\ndbname=pirogue_test_db\nuser=pirogue\npassword=1234\n\n" >> ~/.pg_service.conf
-        PGSERVICE=pirogue_test psql --quiet -v ON_ERROR_STOP=on -f test/demo_data.sql
+      - name: Setup tests
+        run: |
+          printf "[pirogue_test]\nhost=localhost\ndbname=pirogue_test_db\nuser=pirogue\npassword=1234\n\n" >> ~/.pg_service.conf
+          PGSERVICE=pirogue_test psql --quiet -v ON_ERROR_STOP=on -f test/demo_data.sql
 
-    - name: Run bash tests
-      run: |
-        ./test/test_simple_inheritance.sh
+      - name: Run bash tests
+        run: ./test/test_simple_inheritance.sh
 
-    - name: Run Python tests
-      run: nose2 -v
+      - name: Run Python tests
+        run: nose2 -v
 
 

.github/workflows/wheel.yml

@@ -0,0 +1,43 @@
+name: "🐍 Python Wheel"
+
+on:
+  pull_request:
+    branches:
+      - master
+  push:
+    branches:
+      - master
+
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get source code
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.9"
+          cache: "pip"
+          cache-dependency-path: "requirements*.txt"
+
+      - name: Install project requirements
+        run: |
+          python -m pip install -U pip setuptools wheel
+          python -m pip install -U -r requirements.txt
+          python -m pip install -U build
+
+      - name: Install project as a package
+        run: python -m pip install -e .
+
+      - name: Build a binary wheel and a source tarball
+        run: >-
+          python -m build --sdist --wheel --outdir dist/ .
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: python_wheel
+          path: dist/*
+          if-no-files-found: error

pyproject.toml

@@ -0,0 +1,41 @@
+[build-system]
+requires = ["setuptools>=61.0", "setuptools-scm", "wheel", "setuptools-git-versioning"]
+build-backend = "setuptools.build_meta"
+
+[project]
+requires-python = ">=3.9"
+name = "pirogue"
+authors = [
+    {name = "Denis Rouzaud", email = "[email protected]"},
+]
+description = "pirogue let you dynamically and easily create views in PostgreSQL for inheritance or join scenarios."
+keywords =  ["postgres"]
+classifiers = [
+    'Topic :: Database',
+    'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
+    'Intended Audience :: System Administrators',
+    'Intended Audience :: Information Technology',
+    "Intended Audience :: Developers",
+    "Programming Language :: Python :: 3",
+]
+license = { text = "MIT License" }
+dynamic = ["version", "readme", "dependencies", "optional-dependencies"]
+
+[project.urls]
+homepage = "https://opengisch.github.io/pirogue/"
+repository = "https://github.com/opengisch/pirogue"
+tracker = "https://github.com/opengisch/pirogue/issues"
+
+[tool.setuptools-git-versioning]
+enabled = true
+
+[tool.setuptools.dynamic]
+readme = {file = ["README.md"], content-type = "text/markdown"}
+dependencies = {file = ["requirements.txt"]}
+optional-dependencies.test = {file = ["requirements-test.txt"]}
+
+[tool.isort]
+profile = "black"
+
+[tool.black]
+line-length = 120