Merge branch 'release/v1.3.5'

Author: idle-code

.github/workflows/publish-release.yml

@@ -24,6 +24,9 @@ jobs:
           delay_between_requests: 5
           timeout: 60
 
+      - name: Write snap version
+        run: echo "${RELEASE_VERSION#v}" > packaging/snap/version.txt
+
       - name: Free disk space
         run: |
           sudo rm -rf /usr/share/dotnet
@@ -33,7 +36,7 @@ jobs:
           df -h
 
       - name: Build snap package
-        uses: snapcore/action-build@v1
+        uses: canonical/action-build@v1
         id: build_snap
         with:
           path: packaging/snap

packaging/snap/snapcraft.yaml

@@ -17,48 +17,18 @@ platforms:
     build-for: [arm64]
 
 parts:
-  poetry:
-    plugin: dump
-    source: ../..
-    build-packages:
-      - curl
-    override-pull: |
-      curl https://install.python-poetry.org > install-poetry.py
-      export POETRY_HOME=/opt/poetry
-      python3 install-poetry.py --version 1.8.3
-      #$POETRY_HOME/bin/poetry --version
-      #export TEMPREN_VERSION="$($POETRY_HOME/bin/poetry version --short)"
-      #echo $TEMPREN_VERSION | tee /tmp/tempren_version
-
   tempren:
-    after: [poetry]
     plugin: python
-    source: ../..
-    build-environment:
-      - PATH: "/opt/poetry/bin:$PATH"
-    build-packages:
-      - python3-pip
+    source: .
     override-pull: |
       craftctl default
-
-      # Find out program version
-      export TEMPREN_VERSION="$(poetry version --short)"
-      craftctl set version=$TEMPREN_VERSION
-
-      # Prepare requirements.txt to install tempren from the PyPi
-      # This is required as default build algorithm doesn't correctly
-      # export scripts declared in pyproject.toml
-      poetry export --extras=video --output=requirements.txt
-      python3 -m pip download "tempren[video]==$TEMPREN_VERSION"
-      export TEMPREN_HASH=$(python3 -m pip hash tempren*.whl | tail -1)
-      echo "tempren==$TEMPREN_VERSION $TEMPREN_HASH" >> requirements.txt
-
-#    requirements: [requirements.txt]
+      craftctl set version=$(cat "$CRAFT_PART_SRC/version.txt")
+    python-packages:
+      - "tempren[video]"
     stage-packages:
       - libmagic1
       - libmediainfo0v5
 
-
 apps:
   tempren:
     command: bin/tempren

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tempren"
-version = "1.3.4"
+version = "1.3.5"
 description = "Template-based renaming utility"
 readme = "README.md"
 license = "GPL-3.0-or-later"