.gitea/workflows/python-container.yml

@@ -10,72 +10,13 @@ on:
     paths-ignore: ['README.md', '.gitignore', 'LICENSE', 'CONVENTIONS.md', 'ruff.toml']
 
 jobs:
-  release-image:
+  Package-Container:
-    runs-on: ubuntu-latest
+    uses: jmaa/workflows/.gitea/workflows/container.yaml@v6.21
-    container:
-      image: catthehacker/ubuntu:act-latest
-    env:
-      RUNNER_TOOL_CACHE: /toolcache
-    steps:
-      - run: apt-get update
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Setting up SSH
-        if: ${{ hashFiles('requirements_private.txt') != '' }}
-        uses: https://github.com/shimataro/ssh-key-action@v2.5.1
     with:
-          key: ${{ secrets.PIPELINE_WORKER_SSH_KEY }}
+      REGISTRY_DOMAIN: gitfub.space
-          name: id_rsa
+      REGISTRY_ORGANIZATION: jmaa
-          known_hosts: ${{ secrets.PIPELINE_WORKER_KNOWN_HOSTS }}
+    secrets:
-          config: |
+      DOCKER_USERNAME: ${{ secrets.PIPY_REPO_USER }}
-            Host gitfub
+      DOCKER_PASSWORD: ${{ secrets.PIPY_REPO_PASS }}
-              HostName gitfub.space
+      PIPELINE_WORKER_SSH_KEY: ${{ secrets.PIPELINE_WORKER_SSH_KEY }}
-              User ${{ secrets.PIPY_REPO_USER }}
+      PIPELINE_WORKER_KNOWN_HOSTS: ${{ secrets.PIPELINE_WORKER_KNOWN_HOSTS }}
-
-      - name: Download private dependencies
-        if: ${{ hashFiles('requirements_private.txt') != '' }}
-        shell: bash
-        run: |
-          set -e
-          mkdir -p private_deps
-          cd private_deps
-          while IFS=$" " read -r -a dependency_spec
-          do
-            if test -n "${dependency_spec[1]}"
-            then
-              git clone -v --single-branch --no-tags "${dependency_spec[0]}" --branch "${dependency_spec[1]}"
-            else
-              git clone -v --single-branch --no-tags "${dependency_spec[0]}"
-            fi
-          done < ../requirements_private.txt
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker BuildX
-        uses: docker/setup-buildx-action@v2
-
-      - name: Login to Docker Registry
-        uses: docker/login-action@v2
-        with:
-          registry: gitfub.space
-          username: ${{ secrets.PIPY_REPO_USER }}
-          password: ${{ secrets.PIPY_REPO_PASS }}
-
-      - name: Get Meta
-        id: meta
-        run: |
-          echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT
-          echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT
-
-      - name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: |
-            linux/amd64
-          push: true
-          tags: |
-            gitfub.space/jmaa/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}
-            gitfub.space/jmaa/${{ steps.meta.outputs.REPO_NAME }}:latest

.gitea/workflows/python-package.yml

@@ -10,24 +10,11 @@ on:
     paths-ignore: ['README.md', '.gitignore', 'LICENSE', 'CONVENTIONS.md', 'ruff.toml']
 
 jobs:
-  Package-Python-And-Publish:
+  Package:
-    runs-on: ubuntu-latest
+    uses: jmaa/workflows/.gitea/workflows/python-package.yaml@v6.21
-    container:
+    with:
-      image: node:21-bookworm
+      REGISTRY_DOMAIN: gitfub.space
-    steps:
+      REGISTRY_ORGANIZATION: jmaa
-      - name: Setting up Python ${{ env.PYTHON_VERSION }} for ${{runner.arch}} ${{runner.os}}
+    secrets:
-        run: |
+      PIPY_REPO_USER: ${{ secrets.PIPY_REPO_USER }}
-           apt-get update
+      PIPY_REPO_PASS: ${{ secrets.PIPY_REPO_PASS }}
-           apt-get install -y python3 python3-pip
-      - name: Check out repository code
-        if: success()
-        uses: actions/checkout@v3
-      - name: Installing Python Dependencies
-        if: success()
-        run: python3 -m pip install --upgrade pip setuptools wheel build twine pytest --break-system-packages
-      - name: Build
-        if: success()
-        run: python3 -m build
-      - name: Publish
-        if: success()
-        run: python3 -m twine upload --repository-url "https://gitfub.space/api/packages/jmaa/pypi" -u ${{ secrets.PIPY_REPO_USER }} -p ${{ secrets.PIPY_REPO_PASS }} dist/*

README.md

@@ -2,7 +2,6 @@
 <!-- THIS IS AN AUTOGENERATED FILE! -->
 <!-- MANUAL CHANGES CAN AND WILL BE OVERWRITTEN! -->
 
-
 # Personal Data Fetcher Systems
 
 ![Test program/library](https://gitfub.space/Jmaa/personal-data/actions/workflows/python-test.yml/badge.svg)
@@ -74,12 +73,10 @@ Full list of requirements:
 - [requests-util](https://gitfub.space/Jmaa/requests_util)
 - [clients](https://gitfub.space/Jmaa/clients)
 
-
 ## Contributing
 
 Feel free to submit pull requests. Please follow the [Code Conventions](CONVENTIONS.md) when doing so.
 
-
 ### Testing
 
 Testing requires the [pytest](https://docs.pytest.org/en/stable/) library.
@@ -96,7 +93,6 @@ Test coverage can be run using the [`pytest-cov`](https://pypi.org/project/pytes
 pytest --cov=personal_data test
 ```
 
-
 ## License
 
 ```

personal_data/_version.py

@@ -1 +1 @@
-__version__ = '0.1.73'
+__version__ = '0.1.72'

setup.py

@@ -67,7 +67,6 @@ def parse_version_file(text: str) -> str:
 with open(PACKAGE_NAME + '/_version.py') as f:
     version = parse_version_file(f.read())
 
-
 REQUIREMENTS_MAIN = [
     'beautifulsoup4',
     'lxml',
@@ -89,7 +88,6 @@ REQUIREMENTS_TEST = [
     'pytest',
 ]
 
-
 setup(
     name=PACKAGE_NAME,
     version=version,
@@ -99,6 +97,7 @@ setup(
     author='Jon Michael Aanes',
     author_email='jonjmaa@gmail.com',
     url='https://gitfub.space/Jmaa/' + PACKAGE_NAME,
+    packages=[PACKAGE_NAME],
     install_requires=REQUIREMENTS_MAIN,
     extras_require={
         'test': REQUIREMENTS_TEST,