Skip to content

Commit

Permalink
Trying to autoupdate Pyinstaller files
Browse files Browse the repository at this point in the history
  • Loading branch information
beniroquai committed Sep 24, 2022
1 parent 5a009ce commit 44f753b
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 10 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/imswitch-bundle.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
name: imswitch-bundle

on:
workflow_dispatch:
push:
tags:
- '*'
- 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10

jobs:
build:

runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
Expand All @@ -32,6 +30,14 @@ jobs:
- name: Build bundle
run: |
pyinstaller imswitch.spec
cd dist
cd ImSwitch
dir
- name: Upload updated .exe
uses: actions/upload-artifact@v2
with:
name: imswitch-${{ matrix.os }}
path: dist/ImSwitch/ImSwitch.exe
- name: Upload artifact
uses: actions/upload-artifact@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ that it is possible to integrate current state-of-the-art solutions into one uni

### Option A: Standalone bundles for Windows

Windows users can download ImSwitch in standalone format from the [releases page on GitHub](https://github.com/kasasxav/ImSwitch/releases). Further information is available there. An existing Python installation is *not* required.
Windows users can download ImSwitch in standalone format from the [releases page on GitHub](https://github.com/openUC2/ImSwitch/releases). Further information is available there. An existing Python installation is *not* required.

### Option B: Install using pip

Expand Down
2 changes: 1 addition & 1 deletion UC2REST
Submodule UC2REST updated 38 files
+1 −2 .github/workflows/compile_firmware.yml
+0 −30 .github/workflows/create_wheel.yml
+ ESP32/.DS_Store
+1 −4 ESP32/README.md
+ ESP32/build/main.ino.bin
+ ESP32/build/main.ino.bootloader.bin
+ ESP32/build/main.ino.elf
+0 −152,331 ESP32/build/main.ino.map
+ ESP32/build/main.ino.partitions.bin
+1 −0 ESP32/libraries/PS4-esp32-master/src/PS4Controller.cpp
+33 −32 ESP32/libraries/PS4-esp32-master/src/ps4_parser.c
+1 −1 ESP32/libraries/PS4-esp32-master/src/ps4_spp.c
+ ESP32/main/build/esp32.esp32.esp32/boot_app0.bin
+ ESP32/main/build/esp32.esp32.esp32/main.ino.bin
+ ESP32/main/build/esp32.esp32.esp32/main.ino.elf
+51,082 −50,075 ESP32/main/build/esp32.esp32.esp32/main.ino.map
+16 −18 ESP32/main/control_LEDarray.ino
+16 −15 ESP32/main/control_PS4.ino
+54 −78 ESP32/main/control_config.ino
+41 −59 ESP32/main/control_motor.ino
+1 −8 ESP32/main/control_state.ino
+47 −38 ESP32/main/control_wifi.ino
+0 −30 ESP32/main/docs.cpp
+40 −80 ESP32/main/main.ino
+30 −148 ESP32/main/parameters_config.h
+1 −0 ESP32/main/parameters_ledarr.h
+4 −298 ESP32/main/parameters_wifi.h
+1 −9 ESP32/main/pindef.h
+1 −1 setup.py
+3 −12 uc2rest/ESP32Client.py
+0 −13 uc2rest/TEST/TEST_ESP32_Updater.py
+0 −0 uc2rest/TEST_ESP32Client.py
+0 −0 uc2rest/TEST_ESP32_SetConfig.py
+0 −0 uc2rest/TEST_Tutorial.py
+1 −2 uc2rest/__init__.py
+1 −1 uc2rest/__version__.py
+23 −26 uc2rest/config.py
+27 −102 uc2rest/updater.py
2 changes: 1 addition & 1 deletion imswitch/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = '1.2.1'
__version__ = '1.2.2'


# Copyright (C) 2020-2021 ImSwitch developers
Expand Down
8 changes: 8 additions & 0 deletions imswitch/imcommon/controller/CheckUpdatesController.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import requests
from luddite import get_version_pypi
from packaging import version
import subprocess


import imswitch
from imswitch.imcommon.framework import Signal, Thread
Expand Down Expand Up @@ -58,6 +60,8 @@ def run(self):
'https://api.github.com/repos/openUC2/ImSwitch/releases/latest'
)
latestVersion = releaseResponse.json()['tag_name'].lstrip('v')
latestVersionDate = releaseResponse.json()['published_at'].split('T')[0]

if version.parse(latestVersion) > version.parse(currentVersion):
self.sigNewVersionPyInstaller.emit(latestVersion)
else:
Expand All @@ -72,6 +76,10 @@ def run(self):
except Exception:
self.__logger.warning(traceback.format_exc())
self.sigFailed.emit()

def getCurrentCommitDate(self):
return str(subprocess.check_output(['git', 'log', '-n', '1', '--pretty=tformat:%h-%ad', '--date=short']).strip()).split("-")[-3:]



# Copyright (C) 2020-2021 ImSwitch developers
Expand Down
4 changes: 2 additions & 2 deletions imswitch/imcommon/view/AboutDialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ def __init__(self, parent=None, *args, **kwargs):
self.label = QtWidgets.QLabel(
f'<strong>ImSwitch {imswitch.__version__}</strong>'
f'<br /><br />Code available at: '
f'<a href="https://github.com/kasasxav/ImSwitch" style="color: orange">'
f'https://github.com/kasasxav/ImSwitch'
f'<a href="https://github.com/openUC2/ImSwitch" style="color: orange">'
f'https://github.com/openUC2/ImSwitch'
f'</a>'
f'<br />Licensed under the GNU General Public License v3.0.'
)
Expand Down
2 changes: 1 addition & 1 deletion imswitch/imcommon/view/CheckUpdatesDialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def showPyInstallerUpdate(self, newVersion):
)
self.linkLabel.setText(
'The new version may be downloaded from '
'<a href="https://github.com/kasasxav/ImSwitch/releases" style="color: orange">'
'<a href="https://github.com/openUC2/ImSwitch/releases" style="color: orange">'
'the GitHub releases page'
'</a>'
'.'
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ author_email = [email protected]
description = Microscopy control
long_description = file: README.md
long_description_content_type = text/markdown
url = https://github.com/kasasxav/ImSwitch
url = https://github.com/openUC2/ImSwitch
project_urls =
Bug Tracker = https://github.com/openUC2/ImSwitch/issues
classifiers =
Expand Down

0 comments on commit 44f753b

Please sign in to comment.