Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: g4ixt/QtTinySA
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: cxy5014/QtTinySA
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 15 commits
  • 6 files changed
  • 1 contributor

Commits on Mar 7, 2024

  1. add more files to gitignore

    cxy5014 committed Mar 7, 2024

    Verified

    This commit was signed with the committer’s verified signature.
    cxy5014 Bill
    Copy the full SHA
    e91e733 View commit details
  2. Verified

    This commit was signed with the committer’s verified signature.
    cxy5014 Bill
    Copy the full SHA
    723391d View commit details
  3. add Rebuild info

    cxy5014 committed Mar 7, 2024

    Verified

    This commit was signed with the committer’s verified signature.
    cxy5014 Bill
    Copy the full SHA
    ee27423 View commit details
  4. add some python requirements

    cxy5014 committed Mar 7, 2024

    Verified

    This commit was signed with the committer’s verified signature.
    cxy5014 Bill
    Copy the full SHA
    1e86e27 View commit details

Commits on Mar 9, 2024

  1. add github action workflows

    cxy5014 committed Mar 9, 2024

    Verified

    This commit was signed with the committer’s verified signature.
    cxy5014 Bill
    Copy the full SHA
    af428f3 View commit details

Commits on Apr 6, 2024

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    a838109 View commit details
  2. Merge pull request #2 from cxy5014/main

    v0.10.2
    cxy5014 authored Apr 6, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    e51d006 View commit details
  3. spec fix

    cxy5014 committed Apr 6, 2024

    Verified

    This commit was signed with the committer’s verified signature.
    cxy5014 Bill
    Copy the full SHA
    81ff6d2 View commit details
  4. fix Cerificate install

    cxy5014 committed Apr 6, 2024

    Verified

    This commit was signed with the committer’s verified signature.
    cxy5014 Bill
    Copy the full SHA
    ff82385 View commit details

Commits on May 21, 2024

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    1425833 View commit details

Commits on Jun 8, 2024

  1. Merge pull request #3 from g4ixt/main

    Merge from source(v0.10.5)
    cxy5014 authored Jun 8, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    fd3bbed View commit details
  2. Verified

    This commit was signed with the committer’s verified signature.
    cxy5014 Bill
    Copy the full SHA
    0a6751c View commit details

Commits on Jun 26, 2024

  1. Verified

    This commit was signed with the committer’s verified signature.
    cxy5014 Bill
    Copy the full SHA
    6c744ef View commit details

Commits on Oct 5, 2024

  1. Merge remote-tracking branch 'upstream/main'

    # Conflicts:
    #	.gitignore
    cxy5014 committed Oct 5, 2024

    Verified

    This commit was signed with the committer’s verified signature.
    cxy5014 Bill
    Copy the full SHA
    6305902 View commit details

Commits on Feb 4, 2025

  1. Merge remote-tracking branch 'upstream/main'

    # Conflicts:
    #	src/QtTinySA.py
    #	src/requirements.txt
    cxy5014 committed Feb 4, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    cxy5014 Bill
    Copy the full SHA
    18aeceb View commit details
Showing with 175 additions and 15 deletions.
  1. +132 −0 .github/workflows/all_build.yml
  2. +20 −0 .github/workflows/main.yml
  3. +4 −2 .gitignore
  4. +5 −0 src/QtTinySA.py
  5. +10 −10 src/QtTinySA.spec
  6. +4 −3 src/requirements.txt
132 changes: 132 additions & 0 deletions .github/workflows/all_build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
name: Build QtTinySA on macOS
on:
push:
tags:
- "v*"

jobs:
Build-Arm64-version:
name: Build QtTinySA on macOS for Apple Silicon
runs-on: macos-14
env:
KEYCHAIN: job-${{ github.job }}-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
steps:
- uses: actions/checkout@v4

- name: Install Python
uses: actions/setup-python@v5
with:
python-version: '3.12'
cache: 'pip'

- name: Install Certificate
uses: apple-actions/import-codesign-certs@v3
with:
keychain: ${{ env.KEYCHAIN }}
p12-file-base64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
p12-password: ${{ secrets.P12_PASSWORD }}

- name: Install Python Dependence
run: pip install -r requirements.txt

- name: Build QtTinySA
run: pyinstaller --clean --noconfirm QtTinySA.spec

- name: Codesign
env:
CERTIFICATE_NAME: ${{ secrets.CERTIFICATE_NAME }}
run: |
codesign --timestamp --options=runtime -s "$CERTIFICATE_NAME" -v dist/QtTinySA.app -f --deep
- name: Package
run: |
brew install create-dmg
mkdir QtTinySA
ditto dist/QtTinySA.app QtTinySA/QtTinySA.app
ln -s /Applications QtTinySA/Applications
create-dmg QtTinySA-arm64.dmg QtTinySA
- name: Apple Notary
env:
CODESIGN_IDENT_USER: ${{ secrets.CODESIGN_IDENT_USER }}
CODESIGN_TEAM: ${{ secrets.CODESIGN_TEAM }}
CODESIGN_IDENT_PASS: ${{ secrets.CODESIGN_IDENT_PASS }}
run: |
xcrun notarytool store-credentials 'QtTinySA-Codesign-Password' --apple-id "${CODESIGN_IDENT_USER}" --team-id "${CODESIGN_TEAM}" --password "${CODESIGN_IDENT_PASS}"
xcrun notarytool submit "QtTinySA-arm64.dmg" --keychain-profile "QtTinySA-Codesign-Password" --wait
xcrun stapler staple QtTinySA-arm64.dmg
- name: Upload
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
with:
files: QtTinySA-arm64.dmg
draft: false

- name: Delete keychain
if: always()
run: |
security delete-keychain "${{ env.KEYCHAIN }}".keychain
Build-amd64-version:
name: Build QtTinySA on macOS for Intel
runs-on: macos-latest
env:
KEYCHAIN: job-${{ github.job }}-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
steps:
- uses: actions/checkout@v4

- name: Install Python
uses: actions/setup-python@v5
with:
python-version: '3.12'
cache: 'pip'

- name: Install Certificate
uses: apple-actions/import-codesign-certs@v3
with:
keychain: ${{ env.KEYCHAIN }}
p12-file-base64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
p12-password: ${{ secrets.P12_PASSWORD }}

- name: Install Python Dependence
run: pip install -r requirements.txt

- name: Build QtTinySA
run: pyinstaller --clean --noconfirm QtTinySA.spec

- name: Codesign
env:
CERTIFICATE_NAME: ${{ secrets.CERTIFICATE_NAME }}
run: |
codesign --timestamp --options=runtime -s "$CERTIFICATE_NAME" -v dist/QtTinySA.app -f --deep
- name: Package
run: |
brew install create-dmg
mkdir QtTinySA
ditto dist/QtTinySA.app QtTinySA/QtTinySA.app
ln -s /Applications QtTinySA/Applications
create-dmg QtTinySA-amd64.dmg QtTinySA
- name: Apple Notary
env:
CODESIGN_IDENT_USER: ${{ secrets.CODESIGN_IDENT_USER }}
CODESIGN_TEAM: ${{ secrets.CODESIGN_TEAM }}
CODESIGN_IDENT_PASS: ${{ secrets.CODESIGN_IDENT_PASS }}
run: |
xcrun notarytool store-credentials 'QtTinySA-Codesign-Password' --apple-id "${CODESIGN_IDENT_USER}" --team-id "${CODESIGN_TEAM}" --password "${CODESIGN_IDENT_PASS}"
xcrun notarytool submit "QtTinySA-amd64.dmg" --keychain-profile "QtTinySA-Codesign-Password" --wait
xcrun stapler staple QtTinySA-amd64.dmg
- name: Upload
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
with:
files: QtTinySA-amd64.dmg
draft: false

- name: Delete keychain
if: always()
run: |
security delete-keychain "${{ env.KEYCHAIN }}".keychain
20 changes: 20 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Package Application with Pyinstaller

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

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Package Application
uses: g4ixt/pyinstaller-action-linux@main
with:
path: src
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -2,6 +2,8 @@ __pycache__
*~
/QtTinySA/
/QtTinySA-Win_11/
build/
dist/
dist
build
.idea
.DS_Store
firmware_possible_issue.txt
5 changes: 5 additions & 0 deletions src/QtTinySA.py
Original file line number Diff line number Diff line change
@@ -1317,8 +1317,13 @@ def dialogPrefs(): # called by clicking on the setup > preferences menu


def about():
<<<<<<< HEAD:QtTinySA.py
message = ('TinySA Ultra GUI programme using Qt5 and PyQt\nAuthor: Ian Jefferson G4IXT\nRebuild: Bill BG5VGK\nVersion: {} \nConfig: {}'
.format(app.applicationVersion(), config.dbpath))
=======
message = ('TinySA Ultra GUI programme using Qt5 and PyQt\nAuthor: Ian Jefferson G4IXT\n\nVersion: {} \nConfig: {}'
.format(app.applicationVersion(), config.databaseName()))
>>>>>>> upstream/main:src/QtTinySA.py
popUp(message, QMessageBox.Ok, QMessageBox.Information)


20 changes: 10 additions & 10 deletions src/QtTinySA.spec
Original file line number Diff line number Diff line change
@@ -1,25 +1,19 @@
# -*- mode: python ; coding: utf-8 -*-


block_cipher = None


a = Analysis(
['QtTinySA.py'],
pathex=[],
binaries=[],
datas=[],
datas=[('QtTSAprefs.db', '.')],
hiddenimports=[],
hookspath=[],
hooksconfig={},
runtime_hooks=[],
excludes=['pandas','setuptools', 'tk', 'wheel', 'zipp', 'pyyaml', 'packaging', 'altgraph', 'mkl', 'fortran', 'matlab'],
win_no_prefer_redirects=False,
win_private_assemblies=False,
cipher=block_cipher,
noarchive=False,
)
pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
pyz = PYZ(a.pure, a.zipped_data)

exe = EXE(
pyz,
@@ -35,10 +29,16 @@ exe = EXE(
upx=True,
upx_exclude=[],
runtime_tmpdir=None,
console=True,
console=False,
disable_windowed_traceback=False,
argv_emulation=False,
target_arch=None,
codesign_identity=None,
codesign_identity='Developer ID Application: Fujian Province Beacon Rescue Service Center (N7A447KD6D)',
entitlements_file=None,
)
app = BUNDLE(
exe,
name='QtTinySA.app',
icon='tinySA.ico',
bundle_identifier='top.n03.tinysa',
)
7 changes: 4 additions & 3 deletions src/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
altgraph
numpy
platformdirs
PyOpenGL==3.1.1a1
PyQt5==5.15.10
PyOpenGL
PyQt5
PyQt5-sip
pyqtgraph
pyserial
pillow==11.1.0
pillow
pyinstaller