build setup from jinja template

dmachard · Jun 23, 2021 · 6fc27fd · 6fc27fd
1 parent 76a0d8f
commit 6fc27fd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 29 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,9 +20,12 @@ jobs:
         python -m pip install --upgrade pip setuptools wheel
         pip install twine jinja2
 
+    - id: pkg_version
+      run: echo "##[set-output name=data;]$(echo ${{ github.event.release.tag_name }} | cut -c2-)"
+
     - name: Build Python package
       run: |
-        python setup_init.py ${{ github.event.release.tag_name }}
+        python -c 'import jinja2;jinja2.Template(open("setup.j2").read()).stream(version="${{ steps.pkg_version.outputs.data }}").dump("setup.py")'
         python setup.py sdist bdist_wheel
 
     - name: Build the Docker image

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -16,9 +16,12 @@ jobs:
         python -m pip install --upgrade pip setuptools wheel
         pip install twine jinja2
 
+    - id: pkg_version
+      run: echo "##[set-output name=data;]$(echo ${{ github.event.release.tag_name }} | cut -c2-)"
+
     - name: Build Python package
       run: |
-        python setup_init.py ${{ github.event.release.tag_name }}
+        python -c 'import jinja2;jinja2.Template(open("setup.j2").read()).stream(version="${{ steps.pkg_version.outputs.data }}").dump("setup.py")'
         python setup.py sdist bdist_wheel
 
     - name: Twine check

diff --git a/setup_template.j2 → setup.j2 b/setup_template.j2 → setup.j2
@@ -9,7 +9,7 @@ KEYWORDS = ('dnstap receiver client json yaml text')
 
 setuptools.setup(
     name="dnstap_receiver",
-    version="{{ pkg_version }}",
+    version="{{ version }}",
     author="Denis MACHARD",
     author_email="[email protected]",
     description="Python Dnstap receiver",

diff --git a/setup_init.py b/setup_init.py