Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v4.0 #322

Open
wants to merge 93 commits into
base: master
Choose a base branch
from
Open

v4.0 #322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
dcbcbaa
Update .gitignore
chase9 Dec 18, 2023
13df6aa
Add setup.py and update deps
chase9 Dec 18, 2023
34db180
Update python version in setup.py and remove C++ properties file
chase9 Jan 21, 2024
fdc40ce
Merge remote-tracking branch 'upstream/beta' into beta
chase9 Jan 21, 2024
ce0b4e4
feat: Add Plasma Icons support
ItachiSan Apr 2, 2024
2c13c7b
Create new messages per theme switch
l0drex Mar 23, 2024
ccdbe54
Add default profile switching to konsole plugin
Seas0 Mar 29, 2024
aef8f74
Consolidate requirements and switch to Poetry
chase9 Apr 6, 2024
170d6b3
Merge remote-tracking branch 'upstream/beta' into beta
chase9 Apr 7, 2024
779b8e4
Merge pull request #280 from Seas0/master
l0drex Apr 7, 2024
0666f0d
Update suntime dep to 1.3.2
chase9 Apr 8, 2024
43425d4
Update CI workflow for poetry
chase9 Apr 8, 2024
ca95eed
Add CI checking to beta branch
chase9 Apr 8, 2024
c1c6b66
Merge pull request #284 from ItachiSan/plasma-icons
l0drex Apr 10, 2024
d8c870f
Update build script and instructions
chase9 Apr 12, 2024
0e0e5d8
Merge pull request #254 from chase9/beta
l0drex Apr 13, 2024
5b7ba49
Merge in upstream/beta
chase9 Dec 4, 2023
b4f869c
Pass through arguments to flatpak app
chase9 Dec 4, 2023
890c755
add is_flatpak() check
chase9 Dec 4, 2023
2e6ed1d
Fix notifications crashing application
chase9 Dec 4, 2023
8052b4a
WIP: Fix systemd units for Flatpak
chase9 Dec 4, 2023
c207066
Fix installing and running Flatpak
chase9 Dec 18, 2023
bfe0467
Tidy up build files
chase9 Dec 19, 2023
a3d3644
Update check for flatpak environment
chase9 Jan 20, 2024
4e48944
Move repeated flatpak args to a global variable.
chase9 Jan 20, 2024
e3fb1fe
Update flatpak deps
chase9 Jan 20, 2024
47dd739
Change a couple of calls to subprocess to use helper class
chase9 Jan 20, 2024
0ec4a04
Add logic for Kvantum themes in flatpak
chase9 Jan 21, 2024
a861944
Add helpers for finding /usr and /etc
chase9 Apr 6, 2024
87072cb
Update deps and fix flatpak building with poetry
chase9 Apr 7, 2024
0b46f08
Update flatpak to build Poetry deps
chase9 Apr 14, 2024
cd60abb
Add Github action for building Flatpak
chase9 Apr 14, 2024
eb56a5d
Change python version to 3.10
l0drex Apr 14, 2024
0a1bf38
Load env before installing requirements
l0drex Apr 14, 2024
fd1285e
Fix vscode plugin breaking if previously installed
l0drex Apr 14, 2024
c50552f
Setup pyright for VSCode usage
chase9 Apr 14, 2024
88fb7bc
Fix pip install path for ci environment
chase9 Apr 14, 2024
2a41bb9
Add VSCode test configs and fix pytest errors
chase9 Apr 15, 2024
c37cdcb
Merge remote-tracking branch 'upstream/beta' into add-flatpak
chase9 Apr 15, 2024
1177eb0
Update workflow to separate building from CI
chase9 Apr 17, 2024
df0f785
New commit to get workflow to run
chase9 Apr 17, 2024
2b409fe
Use env before installing
l0drex Apr 17, 2024
04f7d81
Refactor gtk available_themes property
l0drex Apr 18, 2024
97e9e8c
Add support for xfce
l0drex Apr 14, 2024
cf2a4d3
Use dbus for notifications
l0drex Apr 18, 2024
9188801
Fix import
l0drex Apr 18, 2024
9209b0c
Add cache to base CI workflow
chase9 Apr 17, 2024
fabd5d4
Merge branch 'beta' of github.com:oskarsh/Yin-Yang into add-flatpak
chase9 Apr 19, 2024
0736169
Fix bad import on gtk.py
chase9 Apr 19, 2024
38baf40
Standardize on single quotes
chase9 Apr 19, 2024
0550cf0
Add back in assertion to firefox.py
chase9 Apr 19, 2024
dbae8f2
Remove print statement from colors.py
chase9 Apr 19, 2024
4757a61
Remove unnesseccary TODO and refactor daemon_handler.py
chase9 Apr 19, 2024
5111101
Downgrade required python version to 3.10
chase9 Apr 19, 2024
1820b6a
Move runner.sh to scripts folder
chase9 Apr 19, 2024
739c9e3
fix: QT Positioning
ItachiSan Apr 2, 2024
4fb491e
fix: Remove TODO comment
ItachiSan Jun 3, 2024
6249c3d
Merge pull request #285 from ItachiSan/working-qt-position
l0drex Jun 19, 2024
55877f1
Merge pull request #185 from chase9/add-flatpak
l0drex Jun 19, 2024
c733b93
Fix invalid escape sequence
l0drex Jun 19, 2024
bdf8451
Streamline name to yin_yang
l0drex Jun 19, 2024
9484ed0
Update runtime
l0drex Jun 19, 2024
9a00aea
Add meta info file
l0drex Jun 19, 2024
a7e83c7
Restrict dbus access
l0drex Jun 19, 2024
0f6fd40
Fix wrong url
l0drex Jun 19, 2024
03e0e0a
Streamline id
l0drex Jun 19, 2024
476557d
Add homepage and developer
l0drex Jun 19, 2024
627d086
FIx desktop file name
l0drex Jun 19, 2024
0ce5582
Add release notes
l0drex Jun 19, 2024
73da844
Add a brand color
l0drex Jun 19, 2024
f04e25b
Restructure
l0drex Jun 19, 2024
9aa73b2
Add urls for bugtracker and donation
l0drex Jun 19, 2024
dae86bd
Add translation prefix
l0drex Jun 19, 2024
16fc68a
Rename notification handler file
l0drex Nov 30, 2024
54bfde4
Fix type
l0drex Nov 30, 2024
ce8bd75
Add instructions for flatpak use
l0drex Nov 30, 2024
8218f94
Fix flatpak permissions
l0drex Nov 30, 2024
6c0ea1c
Put string in quotes
l0drex Nov 30, 2024
ee69e71
Merge branch 'master' into beta
l0drex Nov 30, 2024
43a0520
Update dependencies
l0drex Dec 4, 2024
db2470e
Use poetry build for flatpak setup
l0drex Dec 4, 2024
b88dfd7
Fix no system tray icon in flatpak
l0drex Dec 4, 2024
613dc3a
Add missing dependency
l0drex Dec 4, 2024
4d06cb3
Fix translation path
l0drex Dec 4, 2024
de4d985
Fix type
l0drex Dec 4, 2024
943480a
Improve gtk plugin for KDE
l0drex Dec 4, 2024
5fe1dc2
Add method to list subpaths of service
l0drex Dec 4, 2024
020998b
Use dbus methods for konsole instead of console calls
l0drex Dec 4, 2024
5e7ec31
Implement missing create_message call
l0drex Dec 4, 2024
09c3efb
Use better name for manually created konsole profile
l0drex Dec 4, 2024
556344f
Change translation error to warning to prevent user notifications.
chase9 Dec 15, 2024
3fcd817
Merge pull request #321 from chase9/beta
l0drex Dec 20, 2024
508b167
Change language not found string
l0drex Dec 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .flake8
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
[flake8]
exclude = resources_rc.py,.venv,main_window.py
exclude =
resources_rc.py,
.venv,
main_window.py
build,
dist
max-line-length = 90
80 changes: 80 additions & 0 deletions .github/workflows/build-and-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
name: Build and Release Yin-Yang

on:
push:
pull_request:

jobs:
build:
name: "Build application as Whl"
strategy:
fail-fast: false
matrix:
python-version: ["3.12"]
os: [ubuntu-22.04]
runs-on: ${{matrix.os}}
steps:
# Checkout repo and set up python
- uses: actions/checkout@v4
- name: Install Python
uses: actions/setup-python@v5
with:
python-version: ${{matrix.python-version}}
# Install and configure poetry
- name: Install Poetry
uses: abatilo/actions-poetry@v2
- name: Set up local virtual environment
run: |
poetry config virtualenvs.create true --local
poetry config virtualenvs.in-project true --local
# Load cached venv if it exists
- name: Cache packages
id: cached-poetry-dependencies
uses: actions/cache@v4
with:
# This path is specific to ubuntu
path: ./.venv
key: venv-${{ hashFiles('poetry.lock') }}
# Install dependencies of cache does not exist
- name: Install system dependencies
run: |
sudo apt install qt6-base-dev libsystemd-dev gcc
- name: Install Poetry dependencies
# if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
run: |
poetry install --sync --no-interaction
# Compile and build Yin-Yang
- name: Compile ui, translations and resources
run: poetry run ./scripts/build_ui.sh
- name: Build Whl for release
run: poetry build -f wheel -n -o .
# Upload build artifacts for later use
- name: Upload yin_yang whl for flatpak build
uses: actions/upload-artifact@v4
with:
name: yin_yang-${{ github.sha }}-py3-none-any.whl
path: '*.whl'

flatpak:
name: "Build flatpak file"
runs-on: ubuntu-22.04
needs: build
container:
image: bilelmoussaoui/flatpak-github-actions:kde-5.15-23.08
options: --privileged
strategy:
matrix:
arch: [x86_64]
steps:
- uses: actions/checkout@v4
- name: Download build from last step
uses: actions/download-artifact@v4
with:
path: dist/
name: yin_yang-${{ github.sha }}-py3-none-any.whl
- uses: flatpak/flatpak-github-actions/flatpak-builder@v6
with:
bundle: yin_yang.flatpak
manifest-path: sh.oskar.yin_yang.json
cache-key: flatpak-builder-${{ github.sha }}
arch: x86_64
48 changes: 0 additions & 48 deletions .github/workflows/python-app.yml

This file was deleted.

60 changes: 60 additions & 0 deletions .github/workflows/python-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
# This workflow will install Python dependencies, run tests and lint with a single version of Python

name: Python CI

on:
push:
branches: [master, beta]
pull_request:
branches: [master, beta]

jobs:
ci:
strategy:
fail-fast: false
matrix:
python-version: ["3.12"]
os: [ubuntu-22.04]
runs-on: ${{matrix.os}}
steps:
# Checkout repo and set up python
- uses: actions/checkout@v4
- name: Install Python
uses: actions/setup-python@v5
with:
python-version: ${{matrix.python-version}}
# Install and configure poetry
- name: Install Poetry
uses: abatilo/actions-poetry@v2
- name: Set up local virtual environment
run: |
poetry config virtualenvs.create true --local
poetry config virtualenvs.in-project true --local
# Load cached venv if it exists
- name: Cache packages
id: cached-poetry-dependencies
uses: actions/cache@v4
with:
# This path is specific to ubuntu
path: ./.venv
key: venv-${{ hashFiles('poetry.lock') }}
# Install dependencies of cache does not exist
- name: Install system dependencies
run: |
sudo apt install qt6-base-dev libsystemd-dev gcc
- name: Install Poetry dependencies
# if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
run: |
poetry install --sync --no-interaction
# Build and test Yin-Yang
- name: Compile ui, translations and resources
run: poetry run ./scripts/build_ui.sh
- name: Lint with flake8
run: |
# stop the build if there are Python syntax errors or undefined names
poetry run flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
poetry run flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
- name: Test with pytest
run: |
poetry run pytest -v
Loading