Skip to content

Commit

Permalink
Hopefully fixing tests
Browse files Browse the repository at this point in the history
  • Loading branch information
cdgriffith committed Jul 23, 2022
1 parent 0637e04 commit de017a9
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 11 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

- uses: actions/setup-python@v3
with:
python-version: 3.10
python-version: "3.10"

- name: Gather build version
run: |
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:

- uses: actions/setup-python@v3
with:
python-version: 3.10
python-version: "3.10"

- name: Gather build version
run: |
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
with:
python-version: 3.10
python-version: "3.10"

- name: Gather build version
shell: powershell
Expand Down Expand Up @@ -213,7 +213,7 @@ jobs:

- uses: actions/setup-python@v3
with:
python-version: 3.10
python-version: "3.10"

- name: Gather build version
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

- uses: actions/setup-python@v3
with:
python-version: 3.10
python-version: "3.10"

- uses: actions/cache@v2
with:
Expand All @@ -34,7 +34,7 @@ jobs:

- uses: actions/setup-python@v3
with:
python-version: 3.10
python-version: "3.10"

- name: Install PySide6 requirements
run: |
Expand Down
7 changes: 4 additions & 3 deletions FastFlix_Windows_Installer.spec
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ for root, dirs, files in os.walk('fastflix'):
all_imports = collect_submodules('pydantic') + ['dataclasses', 'colorsys', 'typing_extensions', 'box']
with open("requirements.txt", "r") as reqs:
for line in reqs:
package = line.split("[")[0].split("=")[0].split(">")[0].split("<")[0].replace('"', '').replace("'", '').strip()
package = line.split("[")[0].split("=")[0].split(">")[0].split("<")[0].replace('"', '').replace("'", '').rstrip("~").strip()
if package not in ("pyinstaller", "pypiwin32"):
all_imports.append(package)

Expand All @@ -39,8 +39,9 @@ exe = EXE(pyz,
debug=False,
bootloader_ignore_signals=False,
strip=False,
upx=True,
console=True , icon='fastflix\\data\\icon.ico')
upx=False,
console=True,
icon='fastflix\\data\\icon.ico')
coll = COLLECT(exe,
a.binaries,
a.zipfiles,
Expand Down
5 changes: 3 additions & 2 deletions FastFlix_Windows_OneFile.spec
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ for root, dirs, files in os.walk('fastflix'):
all_imports = collect_submodules('pydantic') + ['dataclasses', 'colorsys', 'typing_extensions', 'box']
with open("requirements.txt", "r") as reqs:
for line in reqs:
package = line.split("[")[0].split("=")[0].split(">")[0].split("<")[0].replace('"', '').replace("'", '').strip()
package = line.split("[")[0].split("=")[0].split(">")[0].split("<")[0].replace('"', '').replace("'", '').rstrip("~").strip()
if package not in ("pyinstaller"):
all_imports.append(package)

Expand Down Expand Up @@ -44,4 +44,5 @@ exe = EXE(pyz,
upx=False,
upx_exclude=[],
runtime_tmpdir=None,
console=True , icon='fastflix\\data\\icon.ico')
console=True,
icon='fastflix\\data\\icon.ico')
13 changes: 13 additions & 0 deletions fastflix/entry.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,19 @@ def startup_options():


def main():
if reusables.win_based:
import platform

try:
win_ver = int(platform.platform().lower().split("-")[1])
except Exception:
win_ver = 0
if win_ver < 10:
input(
"You are an unsupported Windows version, and may not be able to run FastFlix properly.\n"
"Download FastFlix 4.x versions for Windows 7/8 support [press enter to continue]"
)

exit_code = startup_options()
if exit_code is not None:
return exit_code
Expand Down

0 comments on commit de017a9

Please sign in to comment.