Skip to content

Commit a0ea3e8

Browse files
Adam-ColorAdam-Color
authored
Merge pull request #40 from Adam-Color/Develop
merge for 1.8.7
2 parents 62d8a3f + 5b016b0 commit a0ea3e8

13 files changed

Lines changed: 262 additions & 171 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
uses: actions/checkout@v4
1515

1616
- name: Set up Python
17-
uses: actions/setup-python@v5
17+
uses: actions/setup-python@v6.2.0
1818
with:
19-
python-version: '3.13'
19+
python-version: "3.14t"
2020

2121
- name: Create virtual environment
2222
run: |
@@ -32,24 +32,9 @@ jobs:
3232
run: brew install create-dmg
3333

3434
- name: Build macOS installer
35-
working-directory: dev
3635
run: |
37-
# Read version from _version.py
38-
app_version=$(python -c "import sys; sys.path.insert(0, '../src'); from _version import __version__; print(__version__)")
39-
# Update Info.plist
40-
plutil -replace CFBundleShortVersionString -string $app_version ../dist/AppUsageGUI.app/Contents/Info.plist
41-
# Move .app into folder for DMG
42-
mv ../dist/AppUsageGUI.app ../dist/AppUsageGUI/
43-
# Create DMG
44-
create-dmg \
45-
--volicon ../src/core/resources/icon.icns \
46-
--volname AppUsageGUIsetup \
47-
--window-pos 200 190 \
48-
--window-size 800 400 \
49-
--app-drop-link 600 185 \
50-
--eula ../LICENSE.txt \
51-
../dist/AppUsageGUI_v${app_version}_macOS_setup.dmg \
52-
../dist/
36+
chmod +x dev/macos_installer.sh
37+
bash dev/macos_installer.sh
5338
5439
- name: Upload macOS installer
5540
uses: actions/upload-artifact@v4
@@ -64,9 +49,9 @@ jobs:
6449
uses: actions/checkout@v4
6550

6651
- name: Set up Python
67-
uses: actions/setup-python@v5
52+
uses: actions/setup-python@v6.2.0
6853
with:
69-
python-version: '3.13'
54+
python-version: "3.14t"
7055

7156
- name: Create virtual environment
7257
run: |

‎.github/workflows/python-app.yml‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,31 @@ name: Python application
55

66
on:
77
push:
8-
branches: [ "main" ]
8+
branches: ["main"]
99
pull_request:
10-
branches: [ "main" ]
10+
branches: ["main"]
1111

1212
permissions:
1313
contents: read
1414

1515
jobs:
1616
build:
17-
1817
runs-on: ubuntu-latest
1918

2019
steps:
21-
- uses: actions/checkout@v4
22-
- name: Set up Python 3.10
23-
uses: actions/setup-python@v3
24-
with:
25-
python-version: "3.10"
26-
- name: Install dependencies
27-
run: |
28-
python -m pip install --upgrade pip
29-
pip install flake8 pytest
30-
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
31-
- name: Lint with flake8
32-
run: |
33-
# stop the build if there are Python syntax errors or undefined names
34-
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
35-
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
36-
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
20+
- uses: actions/checkout@v4
21+
- name: Set up Python 3.14t
22+
uses: actions/setup-python@v6.2.0
23+
with:
24+
python-version: "3.14t"
25+
- name: Install dependencies
26+
run: |
27+
python -m pip install --upgrade pip
28+
pip install flake8 pytest
29+
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
30+
- name: Lint with flake8
31+
run: |
32+
# stop the build if there are Python syntax errors or undefined names
33+
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
34+
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
35+
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,4 +172,5 @@ cython_debug/
172172
#.idea/
173173

174174
# vscode
175-
.vscode/
175+
.vscode/
176+
.zed/

‎README.md‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
![version](https://img.shields.io/badge/Version-1.8.6-white.svg)
1+
![version](https://img.shields.io/badge/Version-1.8.7-white.svg)
22
![license](https://img.shields.io/badge/License-GPL%20v3-blue.svg)
3-
![python](https://img.shields.io/badge/Python-3.13-green.svg)
3+
![python](https://img.shields.io/badge/Python-3.14t-green.svg)
44

55
# AppUsageGUI
66
### Application Runtime Tracker
@@ -17,16 +17,15 @@ To install, follow the instructions for your platform found here:
1717

1818
### Contributions are welcome and needed! Here is a TODO list:
1919

20-
* Add integrations with professional applications
21-
* free-threading support
2220
* Find a better way to filter out non-GUI apps
21+
* Add integrations with professional applications
2322
* Full linux support with packages
2423

2524
## Building
2625

27-
For building, it is recommended to use Python 3.13
26+
For building, it is recommended to use Python 3.14t
2827

29-
Install requirents:
28+
Install requirements:
3029
`pip install -r requirements.txt`
3130

3231
Run build script:

‎dev/macos_installer.sh‎

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,36 @@
11
#!/bin/bash
2-
# This script is used to create the installer for the macOS version of the application
2+
set -e
33

4-
# Read version from src/_version.py
5-
app_version=$(python -c "import sys; sys.path.insert(0, '../src'); from _version import __version__; print(__version__)")
4+
# Get the directory where this script is located
5+
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE}" )" && pwd )"
6+
PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
67

7-
plutil -replace CFBundleShortVersionString -string ${app_version} ../dist/AppUsageGUI.app/Contents/Info.plist
8+
# Navigate to project root
9+
cd "$PROJECT_ROOT"
810

9-
mv ../dist/AppUsageGUI.app ../dist/AppUsageGUI/
11+
# Read version from _version.py
12+
app_version=$(python -c "import sys; sys.path.insert(0, 'src'); from _version import __version__; print(__version__)")
1013

11-
create-dmg --volicon ../src/core/resources/icon.icns --volname AppUsageGUIsetup --window-pos 200 190 --window-size 800 400 --app-drop-link 600 185 --eula ../LICENSE.txt ../dist/AppUsageGUI_v${app_version}_macOS_setup.dmg ../dist/
14+
echo "Building macOS installer for version $app_version..."
15+
16+
# Ensure dist directory exists
17+
mkdir -p dist/AppUsageGUI
18+
19+
# Update Info.plist
20+
plutil -replace CFBundleShortVersionString -string "$app_version" "dist/AppUsageGUI.app/Contents/Info.plist"
21+
22+
# Move .app into folder for DMG
23+
mv "dist/AppUsageGUI.app" "dist/AppUsageGUI/"
24+
25+
# Create DMG with correct paths
26+
create-dmg \
27+
--volicon "src/core/resources/icon.icns" \
28+
--volname "AppUsageGUIsetup" \
29+
--window-pos 200 190 \
30+
--window-size 800 400 \
31+
--app-drop-link 600 185 \
32+
--eula "LICENSE.txt" \
33+
"dist/AppUsageGUI_v${app_version}_macOS_setup.dmg" \
34+
"dist/"
35+
36+
echo "macOS installer created: dist/AppUsageGUI_v${app_version}_macOS_setup.dmg"

‎dev/windows_installer.iss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#define MyAppName "AppUsageGUI"
55
#define MyAppPublisher "Adam Blair-Smith"
6-
#define MyAppVersion "1.8.6"
6+
#define MyAppVersion "1.8.7"
77
#define MyAppURL "https://github.com/Adam-Color/AppUsageGUI"
88
#define MyAppExeName "AppUsageGUI.exe"
99
#define MyInstallerName "AppUsageGUI_v" + MyAppVersion + "_WINDOWS_setup"

‎requirements.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,3 @@ rubicon-objc==0.5.0
1111
pyinstaller==6.19.0
1212
requests==2.32.4
1313
pillow==12.1.1
14-
pywinauto==0.6.9; sys_platform == "win32"
15-
pywin32==311; sys_platform == "win32"

‎src/_version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "1.8.6"
1+
__version__ = "1.8.7"

0 commit comments

Comments
 (0)