Compare commits
3 commits
Author | SHA1 | Date | |
---|---|---|---|
894d444f91 | |||
a89f43ba2e | |||
d93d3de859 |
7 changed files with 25 additions and 124 deletions
|
@ -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/0.0.1/${GitVersion_MajorMinorPatch}/" src/OptimaLab35/__init__.py
|
||||
- cat src/OptimaLab35/__init__.py
|
||||
- python3 -m pip install build
|
||||
- python3 -m build --wheel --sdist -s src
|
||||
artifacts:
|
||||
paths:
|
||||
- src/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 src/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
|
|
@ -1,15 +0,0 @@
|
|||
---
|
||||
|
||||
.git:create_tag:
|
||||
image: alpine:3.21
|
||||
variables:
|
||||
GIT_STRATEGY: clone
|
||||
GIT_DEPTH: 0
|
||||
GIT_LFS_SKIP_SMUDGE: 1
|
||||
VERSION: ''
|
||||
TOKEN: '' # Token with push privileges
|
||||
script:
|
||||
- apk add git
|
||||
- git remote set-url origin https://oauth2:$TOKEN@$CI_SERVER_HOST/$CI_PROJECT_PATH
|
||||
- git tag $VERSION
|
||||
- git push origin tag $VERSION
|
|
@ -1,31 +0,0 @@
|
|||
---
|
||||
.versioning:gitversion:
|
||||
image:
|
||||
name: mcr.microsoft.com/dotnet/sdk:9.0
|
||||
variables:
|
||||
GIT_STRATEGY: clone
|
||||
GIT_DEPTH: 0 # force a deep/non-shallow fetch need by gitversion
|
||||
GIT_LFS_SKIP_SMUDGE: 1
|
||||
cache: [] # caches and before / after scripts can mess things up
|
||||
script:
|
||||
- |
|
||||
dotnet tool install --global GitVersion.Tool --version 5.*
|
||||
export PATH="$PATH:/root/.dotnet/tools"
|
||||
|
||||
dotnet-gitversion -output buildserver
|
||||
|
||||
# We could just collect the output file gitversion.properties (with artifacts:report:dotenv: gitversion.properties as it is already in DOTENV format,
|
||||
# however it contains ~33 variables which unnecessarily consumes many of the 50 max DOTENV variables of the free GitLab version.
|
||||
# Limits are higher for licensed editions, see https://docs.gitlab.com/ee/ci/yaml/artifacts_reports.html#artifactsreportsdotenv
|
||||
grep 'GitVersion_LegacySemVer=' gitversion.properties >> gitversion.env
|
||||
grep 'GitVersion_SemVer=' gitversion.properties >> gitversion.env
|
||||
grep 'GitVersion_FullSemVer=' gitversion.properties >> gitversion.env
|
||||
grep 'GitVersion_Major=' gitversion.properties >> gitversion.env
|
||||
grep 'GitVersion_Minor=' gitversion.properties >> gitversion.env
|
||||
grep 'GitVersion_Patch=' gitversion.properties >> gitversion.env
|
||||
grep 'GitVersion_MajorMinorPatch=' gitversion.properties >> gitversion.env
|
||||
grep 'GitVersion_BuildMetaData=' gitversion.properties >> gitversion.env
|
||||
artifacts:
|
||||
reports:
|
||||
# propagates variables into the pipeline level
|
||||
dotenv: gitversion.env
|
|
@ -74,7 +74,7 @@ steps:
|
|||
commands:
|
||||
- ls
|
||||
- python3 -m pip install twine
|
||||
- python3 -m twine upload dist/*
|
||||
- python3 -m twine upload src/dist/*
|
||||
|
||||
- name: publish_forgejo
|
||||
depends_on: [gitversion, tagging, build]
|
||||
|
@ -89,4 +89,4 @@ steps:
|
|||
commands:
|
||||
- ls
|
||||
- python3 -m pip install twine
|
||||
- python3 -m twine upload --repository-url https://code.boxyfoxy.net/api/packages/CodeByMrFinchum/pypi dist/*
|
||||
- python3 -m twine upload --repository-url https://code.boxyfoxy.net/api/packages/CodeByMrFinchum/pypi src/dist/*
|
||||
|
|
21
CHANGELOG.md
21
CHANGELOG.md
|
@ -1,10 +1,25 @@
|
|||
# Changelog
|
||||
## 1.5.x
|
||||
### 1.5.0: Feature - Time of dateEdit now today
|
||||
- Changes that instead of the dateEdit elements being always set to a last day of 2024 it is the current day.
|
||||
|
||||
## 1.4.x
|
||||
### 1.4.2: Fix links
|
||||
- Fixed that changelog was linked to GitLab, not it is to code.boxyfoxy.net
|
||||
- Fixed Changelog
|
||||
|
||||
### 1.4.1: Fix CI
|
||||
- Fixed pipline
|
||||
### 1.4.0: New CI
|
||||
- Migrated repo from GitLab to my forgejo instance, therefore switching to woodpecker CI
|
||||
|
||||
---
|
||||
|
||||
## 1.3.x
|
||||
### 1.3.4: Fix - Spelling (25.04.01)
|
||||
- Fixed misspelling in preview window.
|
||||
|
||||
### 1.3.3: Patch – Increased Preview Performance x2 (25.04.01)
|
||||
### 1.3.3: Patch - Increased Preview Performance x2 (25.04.01)
|
||||
- Reduced preview stutter: Previously, the image was updated twice when changing brightness or contrast. Now, it updates only once, improving performance by 100%.
|
||||
- There is still room for improvement. Analysis shows that image processing takes the most time, while displaying in Qt is relatively fast. Reducing the image size impacts performance, so resizing to 50% is a good idea.
|
||||
- There is an issue where `QRunner` does not always finish in the correct order when brightness or contrast values are changed rapidly. ATM I do not know how to fix this easly.
|
||||
|
@ -16,7 +31,7 @@
|
|||
### 1.3.1: Fix - Fixed insert exif not working (25.03.27)
|
||||
- Fixed the feature that inserted exif into images without modifying them.
|
||||
|
||||
### 1.3.0: Feature – Write Adjustments into EXIF (25.03.24)
|
||||
### 1.3.0: Feature - Write Adjustments into EXIF (25.03.24)
|
||||
- Changes to contrast and brightness are now recorded in the EXIF comment section (labeled *Scanner* in the program).
|
||||
- This allows users to track what adjustments were made to an image.
|
||||
|
||||
|
@ -169,7 +184,7 @@
|
|||
- Improved error handling for updater: now displays the specific error message instead of just **"error"** when an issue occurs during update checks.
|
||||
- Ensured all child windows close when the main window is closed.
|
||||
|
||||
### 0.8.3: Fix – OptimaLab35 Not Closing After Update
|
||||
### 0.8.3: Fix - OptimaLab35 Not Closing After Update
|
||||
- Fixed an issue where **OptimaLab35** would not close properly when updating, resulting in an unresponsive instance and multiple running processes.
|
||||
|
||||
### 0.8.2: Patch for New PyPiUpdater Version
|
||||
|
|
|
@ -25,7 +25,8 @@ from PySide6.QtCore import (
|
|||
Signal,
|
||||
QObject,
|
||||
QRegularExpression,
|
||||
Qt
|
||||
Qt,
|
||||
QDate
|
||||
)
|
||||
|
||||
from PySide6.QtWidgets import (
|
||||
|
@ -96,7 +97,7 @@ class OptimaLab35(QMainWindow, Ui_MainWindow):
|
|||
validator = QRegularExpressionValidator(regex)
|
||||
self.ui.lat_lineEdit.setValidator(validator)
|
||||
self.ui.long_lineEdit.setValidator(validator)
|
||||
|
||||
self.ui.dateEdit.setDate(QDate.currentDate())
|
||||
# UI related function, changing parts, open, etc.
|
||||
def open_preview_window(self):
|
||||
self.preview_window = PreviewWindow()
|
||||
|
@ -130,7 +131,7 @@ class OptimaLab35(QMainWindow, Ui_MainWindow):
|
|||
|
||||
<p>For more details, visit:</p>
|
||||
<ul>
|
||||
<li><a href="https://gitlab.com/CodeByMrFinchum/OptimaLab35/-/blob/main/CHANGELOG.md?ref_type=heads">Changelog</a></li>
|
||||
<li><a href="https://code.boxyfoxy.net/CodeByMrFinchum/OptimaLab35/src/branch/main/CHANGELOG.md">Changelog</a></li>
|
||||
<li><a href="https://gitlab.com/CodeByMrFinchum/OptimaLab35">OptimaLab35 GitLab</a></li>
|
||||
<li><a href="https://gitlab.com/CodeByMrFinchum/optima35">optima35 GitLab</a></li>
|
||||
</ul>
|
||||
|
|
|
@ -79,7 +79,7 @@ class SettingsWindow(QMainWindow, Ui_Settings_Window):
|
|||
# Connect button press/release
|
||||
self.ui.check_for_update_Button.pressed.connect(self.start_long_press)
|
||||
self.ui.check_for_update_Button.released.connect(self.cancel_long_press)
|
||||
self.ui.label_5.setText('<li><a href="https://gitlab.com/CodeByMrFinchum/OptimaLab35/-/blob/main/CHANGELOG.md?ref_type=heads">Changelog</a></li>')
|
||||
self.ui.label_5.setText('<li><a href="https://code.boxyfoxy.net/CodeByMrFinchum/OptimaLab35/src/branch/main/CHANGELOG.md">Changelog</a></li>')
|
||||
self.ui.label_5.setOpenExternalLinks(True)
|
||||
#settings related
|
||||
self.load_settings_into_ui()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue