1
0

Compare commits

...

3 Commits

Author SHA1 Message Date
75236bafae 🤖 Bumped version to 0.1.73
Some checks failed
Build Python Container / release-image (push) Failing after 2m3s
Package Python / Package-Python-And-Publish (push) Failing after 26s
Run Python tests (through Pytest) / Test (push) Failing after 24s
Verify Python project can be installed, loaded and have version checked / Test (push) Failing after 22s
This commit was automatically generated by [a script](https://gitfub.space/Jmaa/repo-manager)
2025-05-27 00:33:50 +02:00
5d5cc92162 🤖 Repository layout updated to latest version
This commit was automatically generated by [a script](https://gitfub.space/Jmaa/repo-manager)
2025-05-27 00:30:20 +02:00
67740408e3 🤖 Repository layout updated to latest version
This commit was automatically generated by [a script](https://gitfub.space/Jmaa/repo-manager)
2025-05-21 18:05:25 +02:00
5 changed files with 97 additions and 20 deletions

View File

@ -10,13 +10,72 @@ on:
paths-ignore: ['README.md', '.gitignore', 'LICENSE', 'CONVENTIONS.md', 'ruff.toml'] paths-ignore: ['README.md', '.gitignore', 'LICENSE', 'CONVENTIONS.md', 'ruff.toml']
jobs: jobs:
Package-Container: release-image:
uses: jmaa/workflows/.gitea/workflows/container.yaml@v6.21 runs-on: ubuntu-latest
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: with:
REGISTRY_DOMAIN: gitfub.space key: ${{ secrets.PIPELINE_WORKER_SSH_KEY }}
REGISTRY_ORGANIZATION: jmaa name: id_rsa
secrets: known_hosts: ${{ secrets.PIPELINE_WORKER_KNOWN_HOSTS }}
DOCKER_USERNAME: ${{ secrets.PIPY_REPO_USER }} config: |
DOCKER_PASSWORD: ${{ secrets.PIPY_REPO_PASS }} Host gitfub
PIPELINE_WORKER_SSH_KEY: ${{ secrets.PIPELINE_WORKER_SSH_KEY }} HostName gitfub.space
PIPELINE_WORKER_KNOWN_HOSTS: ${{ secrets.PIPELINE_WORKER_KNOWN_HOSTS }} User ${{ secrets.PIPY_REPO_USER }}
- 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

View File

@ -10,11 +10,24 @@ on:
paths-ignore: ['README.md', '.gitignore', 'LICENSE', 'CONVENTIONS.md', 'ruff.toml'] paths-ignore: ['README.md', '.gitignore', 'LICENSE', 'CONVENTIONS.md', 'ruff.toml']
jobs: jobs:
Package: Package-Python-And-Publish:
uses: jmaa/workflows/.gitea/workflows/python-package.yaml@v6.21 runs-on: ubuntu-latest
with: container:
REGISTRY_DOMAIN: gitfub.space image: node:21-bookworm
REGISTRY_ORGANIZATION: jmaa steps:
secrets: - name: Setting up Python ${{ env.PYTHON_VERSION }} for ${{runner.arch}} ${{runner.os}}
PIPY_REPO_USER: ${{ secrets.PIPY_REPO_USER }} run: |
PIPY_REPO_PASS: ${{ secrets.PIPY_REPO_PASS }} apt-get update
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/*

View File

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

View File

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

View File

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