From 2e2bba2aa5d5a91dce1724dcde6f8a2403af8937 Mon Sep 17 00:00:00 2001 From: Mr Finchum Date: Thu, 10 Apr 2025 16:59:59 +0200 Subject: [PATCH 1/7] fix: change source to dot --- .woodpecker/woodpecker_ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/woodpecker_ci.yml b/.woodpecker/woodpecker_ci.yml index e015764..1b3d924 100644 --- a/.woodpecker/woodpecker_ci.yml +++ b/.woodpecker/woodpecker_ci.yml @@ -42,7 +42,7 @@ steps: - git config --global user.email "ci@noreply.boxyfoxy.net" - git config --global user.name "CI Bot" - git remote set-url origin https://CodeByMrFinchum:$${CI_TOKEN}@code.boxyfoxy.net/$${CI_REPO}.git - - source gitversion.env + - . gitversion.env - git tag $GitVersion_SemVer - git push origin tag $GitVersion_SemVer @@ -54,7 +54,7 @@ steps: image: python:3.9.21 commands: - ls - - source gitversion.env + - . gitversion.env - sed -i "s/^__version__ = .*/__version__ = \"$GitVersion_SemVer\"/" src/PyPiUpdater/__init__.py - cat src/PyPiUpdater/__init__.py - python3 -m pip install build From 03cf68b8731ca76ee52c08696fdd902d18704555 Mon Sep 17 00:00:00 2001 From: Mr Finchum Date: Thu, 10 Apr 2025 17:05:49 +0200 Subject: [PATCH 2/7] fix: use export for vars --- .woodpecker/woodpecker_ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.woodpecker/woodpecker_ci.yml b/.woodpecker/woodpecker_ci.yml index 1b3d924..ede607d 100644 --- a/.woodpecker/woodpecker_ci.yml +++ b/.woodpecker/woodpecker_ci.yml @@ -54,7 +54,8 @@ steps: image: python:3.9.21 commands: - ls - - . gitversion.env + - cat gitversion.env + - export $(cat gitversion.env | xargs) - sed -i "s/^__version__ = .*/__version__ = \"$GitVersion_SemVer\"/" src/PyPiUpdater/__init__.py - cat src/PyPiUpdater/__init__.py - python3 -m pip install build From 364af1cb6ec378b62db94b7a0700b4f8d4b96b8f Mon Sep 17 00:00:00 2001 From: Mr Finchum Date: Fri, 11 Apr 2025 11:42:43 +0200 Subject: [PATCH 3/7] ci: now also upload to package on forgejo. --- .woodpecker/woodpecker_ci.yml | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/.woodpecker/woodpecker_ci.yml b/.woodpecker/woodpecker_ci.yml index ede607d..ebb0ec7 100644 --- a/.woodpecker/woodpecker_ci.yml +++ b/.woodpecker/woodpecker_ci.yml @@ -61,7 +61,7 @@ steps: - python3 -m pip install build - python3 -m build - - name: release + - name: publish_pypi depends_on: [gitversion, tagging, build] when: event: push @@ -75,3 +75,27 @@ steps: - ls - python3 -m pip install twine - python3 -m twine upload dist/* + + - name: publish_forgejo + depends_on: [gitversion, tagging, build] + when: + event: push + branch: main + image: python:3.9.21 + environment: + CI_TOKEN: + from_secret: CI_TOKEN + commands: + - ls + - python3 -m pip install twine + - | + cat > ~/.pypirc < Date: Fri, 11 Apr 2025 11:56:12 +0200 Subject: [PATCH 4/7] fix: fixes publish to forgejo package --- .woodpecker/woodpecker_ci.yml | 6 +++--- CHANGELOG.md | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.woodpecker/woodpecker_ci.yml b/.woodpecker/woodpecker_ci.yml index ebb0ec7..7822860 100644 --- a/.woodpecker/woodpecker_ci.yml +++ b/.woodpecker/woodpecker_ci.yml @@ -83,8 +83,8 @@ steps: branch: main image: python:3.9.21 environment: - CI_TOKEN: - from_secret: CI_TOKEN + PKG_TOKEN: + from_secret: PKG_TOKEN commands: - ls - python3 -m pip install twine @@ -96,6 +96,6 @@ steps: [forgejo] repository = https://code.boxyfoxy.net/api/packages/CodeByMrFinchum/pypi username = CodeByMrFinchum - password = ${CI_TOKEN} + password = ${PKG_TOKEN} EOF - python3 -m twine upload --repository forgejo dist/* diff --git a/CHANGELOG.md b/CHANGELOG.md index c7a8815..3e847e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## 0.8-0.9: CI woodpecker (25.04.10-11) +- Changes to the pipeline no + ## 0.7.x ### 0.7.2: Removed Debugging Leftovers - Cleaned up code used for debugging. From dc8b1ca9ed18fb9f6983211beeb4470d273bb531 Mon Sep 17 00:00:00 2001 From: Mr Finchum Date: Fri, 11 Apr 2025 12:09:32 +0200 Subject: [PATCH 5/7] fix: skip twine file --- .woodpecker/woodpecker_ci.yml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/.woodpecker/woodpecker_ci.yml b/.woodpecker/woodpecker_ci.yml index 7822860..c531675 100644 --- a/.woodpecker/woodpecker_ci.yml +++ b/.woodpecker/woodpecker_ci.yml @@ -83,19 +83,10 @@ steps: branch: main image: python:3.9.21 environment: - PKG_TOKEN: + TWINE_PASSWORD: from_secret: PKG_TOKEN + TWINE_USERNAME: "CodeByMrFinchum" commands: - ls - python3 -m pip install twine - - | - cat > ~/.pypirc < Date: Fri, 11 Apr 2025 12:16:59 +0200 Subject: [PATCH 6/7] Adding info about the migration to readme. --- README.md | 2 ++ pip_README.md | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c3f04c1..ceb666a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ # PyPiUpdater +Developed on my [forgejo instance](https://code.boxyfoxy.net/CodeByMrFinchum), [GitLab](https://gitlab.com/CodeByMrFinchum) is used as backup. + **UNFINISHED** Still early code, functions might change drasticly **PyPiUpdater** is a Python library for managing updates of packages installed via `pip`. diff --git a/pip_README.md b/pip_README.md index 2fb85ac..81c43b3 100644 --- a/pip_README.md +++ b/pip_README.md @@ -1,3 +1,3 @@ Simple program to update package from PyPi with pip. -For more info see [PyPiUpdater gitlab](https://gitlab.com/CodeByMrFinchum/PyPiUpdater#). +For more info see [PyPiUpdater forgejo](https://code.boxyfoxy.net/CodeByMrFinchum/PyPiUpdater) or backup repo [PyPiUpdater gitlab](https://gitlab.com/CodeByMrFinchum/PyPiUpdater#). From 77d7092a24f1bccae7a3aa8ef1784806f2ef4a72 Mon Sep 17 00:00:00 2001 From: Mr Finchum Date: Fri, 11 Apr 2025 12:23:11 +0200 Subject: [PATCH 7/7] patch: removed old gitlab ci file. --- .gitlab-ci.yml | 69 -------------------------------------------------- 1 file changed, 69 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index d93834d..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,69 +0,0 @@ ---- -include: - - local: .gitlab-ci/versioning/gitversion.yml - - local: .gitlab-ci/git/create_tag.yml - -stages: - - build - - release - -gitversion: - extends: .versioning:gitversion - stage: .pre - tags: - - gitlab-org-docker - rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Run this job when commits are pushed or merged to the default branch - -build: - stage: build - image: python:3.9.21 - tags: - - gitlab-org-docker - rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Run this job when commits are pushed or merged to the default branch - needs: - - job: gitversion - artifacts: true - script: - - sed -i "s/^__version__ = .*/__version__ = \"${GitVersion_MajorMinorPatch}\"/" src/PyPiUpdater/__init__.py - - cat src/PyPiUpdater/__init__.py - - python3 -m pip install build - - python3 -m build - artifacts: - paths: - - dist/* - expire_in: 1 day - -publish: - stage: release - image: python:3.9.21 - tags: - - gitlab-org-docker - rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Run this job when commits are pushed or merged to the default branch - variables: - TWINE_USERNAME: "__token__" - TWINE_PASSWORD: $TWINE_API - needs: - - job: build - artifacts: true - script: - - python3 -m pip install twine - - python3 -m twine upload dist/* - -create_tag: - extends: .git:create_tag - stage: release - tags: - - gitlab-org-docker - variables: - VERSION: $GitVersion_SemVer - TOKEN: $GITLAB_TOKEN - needs: - - job: gitversion - artifacts: true - rules: - - if: $CI_COMMIT_TAG - when: never # Do not run this job when a tag is created manually - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Run this job when commits are pushed or merged to the default branch