commit
704e7e1eda
3 changed files with 13 additions and 13 deletions
18
.github/workflows/main.yml
vendored
18
.github/workflows/main.yml
vendored
|
@ -7,10 +7,10 @@ jobs:
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Setup Python 3.10 x64
|
- name: Setup Python 3.11 x64
|
||||||
uses: actions/setup-python@v4
|
uses: actions/setup-python@v4
|
||||||
with:
|
with:
|
||||||
python-version: '3.10'
|
python-version: '3.11'
|
||||||
architecture: 'x64'
|
architecture: 'x64'
|
||||||
- name: Update pip
|
- name: Update pip
|
||||||
run: python -m pip install --upgrade pip
|
run: python -m pip install --upgrade pip
|
||||||
|
@ -33,10 +33,10 @@ jobs:
|
||||||
runs-on: windows-2019
|
runs-on: windows-2019
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Setup Python 3.10 x64
|
- name: Setup Python 3.11 x64
|
||||||
uses: actions/setup-python@v4
|
uses: actions/setup-python@v4
|
||||||
with:
|
with:
|
||||||
python-version: '3.10'
|
python-version: '3.11'
|
||||||
architecture: 'x64'
|
architecture: 'x64'
|
||||||
- name: Update pip
|
- name: Update pip
|
||||||
run: python -m pip install --upgrade pip
|
run: python -m pip install --upgrade pip
|
||||||
|
@ -49,11 +49,11 @@ jobs:
|
||||||
- name: Run PyInstaller
|
- name: Run PyInstaller
|
||||||
run: python3 pyinst.py --no-prompts --onefile --no-upx --crt --no-clean --windowed
|
run: python3 pyinst.py --no-prompts --onefile --no-upx --crt --no-clean --windowed
|
||||||
- name: Create archive (.zip)
|
- name: Create archive (.zip)
|
||||||
run: tar.exe -a -c -f Pesterchum_win64_py310.zip -C dist Pesterchum
|
run: tar.exe -a -c -f Pesterchum_win64_py311.zip -C dist Pesterchum
|
||||||
- uses: actions/upload-artifact@v3
|
- uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
name: Pesterchum_win64_py310.zip
|
name: Pesterchum_win64_py311.zip
|
||||||
path: Pesterchum_win64_py310.zip
|
path: Pesterchum_win64_py311.zip
|
||||||
|
|
||||||
build_win32_38:
|
build_win32_38:
|
||||||
runs-on: windows-2019
|
runs-on: windows-2019
|
||||||
|
@ -85,10 +85,10 @@ jobs:
|
||||||
runs-on: macos-11
|
runs-on: macos-11
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Setup Python 3.10 x64
|
- name: Setup Python 3.11 x64
|
||||||
uses: actions/setup-python@v4
|
uses: actions/setup-python@v4
|
||||||
with:
|
with:
|
||||||
python-version: '3.10'
|
python-version: '3.11'
|
||||||
architecture: 'x64'
|
architecture: 'x64'
|
||||||
- name: Update pip
|
- name: Update pip
|
||||||
run: python -m pip install --upgrade pip
|
run: python -m pip install --upgrade pip
|
||||||
|
|
4
.github/workflows/pylint.yml
vendored
4
.github/workflows/pylint.yml
vendored
|
@ -5,10 +5,10 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Setup Python 3.10 x64
|
- name: Setup Python 3.11 x64
|
||||||
uses: actions/setup-python@v4
|
uses: actions/setup-python@v4
|
||||||
with:
|
with:
|
||||||
python-version: '3.10'
|
python-version: '3.11'
|
||||||
architecture: 'x64'
|
architecture: 'x64'
|
||||||
- name: Install Dependencies
|
- name: Install Dependencies
|
||||||
run: python3 -m pip install PyQt6 certifi PyInstaller
|
run: python3 -m pip install PyQt6 certifi PyInstaller
|
||||||
|
|
4
toast.py
4
toast.py
|
@ -107,7 +107,7 @@ class ToastMachine:
|
||||||
for k, v in self.machine.types.items():
|
for k, v in self.machine.types.items():
|
||||||
if self.machine.type == k:
|
if self.machine.type == k:
|
||||||
try:
|
try:
|
||||||
args = inspect.getargspec(v.__init__).args
|
args = inspect.getfullargspec(v.__init__).args
|
||||||
except:
|
except:
|
||||||
args = []
|
args = []
|
||||||
|
|
||||||
|
@ -133,7 +133,7 @@ class ToastMachine:
|
||||||
if "default" in self.machine.types:
|
if "default" in self.machine.types:
|
||||||
if (
|
if (
|
||||||
"parent"
|
"parent"
|
||||||
in inspect.getargspec(
|
in inspect.getfullargspec(
|
||||||
self.machine.types["default"].__init__
|
self.machine.types["default"].__init__
|
||||||
).args
|
).args
|
||||||
):
|
):
|
||||||
|
|
Loading…
Reference in a new issue