Merge pull request #179 from ing-bank/develop

Semantic release CI

Author: sbrugman

.github/workflows/pypi.yml

@@ -1,23 +1,23 @@
-# Creates a draft release when a new tag is pushed
-name: Release
+name: Semantic Release
 
 on:
   push:
-    tags:
-      - "v*.*.*"
+    branches:
+      - master
 
 jobs:
-  build:
+  release:
     runs-on: ubuntu-latest
+    concurrency: release
+
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Get the version
-        id: get_version
-        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
-      - name: Release
-        uses: softprops/action-gh-release@v1
-        with:
-          name: "popmon ${{ steps.get_version.outputs.VERSION }}"
-          body: "Release notes are available [here](https://github.com/ing-bank/popmon/blob/master/CHANGELOG.md)."
-          draft: true
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - name: Python Semantic Release
+      uses: relekang/python-semantic-release@master
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        repository_username: __token__
+        repository_password: ${{ secrets.PYPI_TOKEN }}

.github/workflows/release.yml

@@ -1,11 +1,10 @@
-# See: https://docs.readthedocs.io/en/latest/yaml-config.html
-# .readthedocs.yml
+# See: https://docs.readthedocs.io/en/latest/config-file/v2.html
+version: 2
 
 build:
   image: latest
 
 python:
-  version: 3.8
-  setup_py_install: true
+  version: '3.8'
   install:
     - requirements: docs/requirements.txt

.readthedocs.yml

@@ -1,5 +1,7 @@
 # Release notes
 
+<!--next-version-placeholder-->
+
 ## [v0.4.4](https://github.com/ing-bank/popmon/compare/v0.4.3...v0.4.4) (2021-10-22)
 
 

.versionrc.json

@@ -1,3 +1,3 @@
 """THIS FILE IS AUTO-GENERATED BY SETUP.PY."""
 
-version = "0.5.0"
+version = "0.4.4"

CHANGELOG.md

@@ -7,4 +7,10 @@ markers = ["spark"]
 "spark.executor.instances" = 1
 "master" = "local[*]"
 "spark.driver.host" = "192.168.1.78"
-"spark.sql.catalogImplementation" = "in-memory"
+"spark.sql.catalogImplementation" = "in-memory"
+
+[tool.semantic_release]
+version_variable = [
+    "setup.py:__version__",
+    "popmon/version.py:version",
+]

bump.py

@@ -1,5 +1,7 @@
 from setuptools import find_packages, setup
 
+__version__ = "0.4.4"
+
 with open("requirements.txt") as f:
     REQUIREMENTS = f.read().splitlines()
 
@@ -15,7 +17,7 @@ def setup_package() -> None:
     """
     setup(
         name="popmon",
-        version="0.4.4",
+        version=__version__,
         url="https://github.com/ing-bank/popmon",
         license="MIT",
         author="ING Wholesale Banking Advanced Analytics",