Newest pydantic causing import issues in executable

cdgriffith · Feb 27, 2021 · e835a65 · e835a65
1 parent f5c2c86
commit e835a65
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/build_linux.yaml b/.github/workflows/build_linux.yaml
@@ -27,7 +27,7 @@ jobs:
     - name: Insatll requirements
       run: |
         python -m pip install --upgrade pip setuptools --ignore-installed
-        python -m pip install --upgrade wheel
+        python -m pip install --upgrade wheel typing_extensions
         python -m pip install -r requirements-build.txt
         python -m pip install --upgrade pyqt5-tools
 

diff --git a/.github/workflows/build_linux_legacy.yaml b/.github/workflows/build_linux_legacy.yaml
@@ -27,7 +27,7 @@ jobs:
     - name: Insatll requirements
       run: |
         python -m pip install --upgrade pip setuptools --ignore-installed
-        python -m pip install --upgrade wheel
+        python -m pip install --upgrade wheel typing_extensions
         python -m pip install -r requirements-build.txt
         python -m pip install --upgrade pyqt5-tools
 

diff --git a/.github/workflows/build_mac.yaml b/.github/workflows/build_mac.yaml
@@ -27,7 +27,7 @@ jobs:
     - name: Insatll requirements
       run: |
         python -m pip install --upgrade pip setuptools --ignore-installed
-        python -m pip install --upgrade wheel
+        python -m pip install --upgrade wheel typing_extensions
         python -m pip install -r requirements-build.txt
 
     - name: Grab iso-639 lists

diff --git a/.github/workflows/build_windows.yaml b/.github/workflows/build_windows.yaml
@@ -30,7 +30,7 @@ jobs:
       shell: cmd
       run: |
         python -m pip install --upgrade pip setuptools --ignore-installed
-        python -m pip install --upgrade pypiwin32 wheel
+        python -m pip install --upgrade pypiwin32 wheel typing_extensions
         python -m pip install -r requirements-build.txt
 
     - name: Grab iso-639 lists

diff --git a/FastFlix_Nix_OneFile.spec b/FastFlix_Nix_OneFile.spec
@@ -11,7 +11,7 @@ for root, dirs, files in os.walk('fastflix'):
 	for file in files:
 		all_fastflix_files.append((os.path.join(root,file), root))
 
-all_imports = collect_submodules('pydantic') + ['dataclasses', 'colorsys']
+all_imports = collect_submodules('pydantic') + ['dataclasses', 'colorsys', 'typing_extensions']
 with open("requirements-build.txt", "r") as reqs:
     for line in reqs:
         package = line.split("=")[0].split(">")[0].split("<")[0].replace('"', '').replace("'", '').strip()

diff --git a/FastFlix_Windows_Installer.spec b/FastFlix_Windows_Installer.spec
@@ -11,8 +11,7 @@ for root, dirs, files in os.walk('fastflix'):
 	for file in files:
 		all_fastflix_files.append((os.path.join(root,file), root))
 
-
-all_imports = collect_submodules('pydantic') + ['dataclasses', 'colorsys']
+all_imports = collect_submodules('pydantic') + ['dataclasses', 'colorsys', 'typing_extensions']
 with open("requirements-build.txt", "r") as reqs:
     for line in reqs:
         package = line.split("=")[0].split(">")[0].split("<")[0].replace('"', '').replace("'", '').strip()

diff --git a/FastFlix_Windows_OneFile.spec b/FastFlix_Windows_OneFile.spec
@@ -11,7 +11,7 @@ for root, dirs, files in os.walk('fastflix'):
 	for file in files:
 		all_fastflix_files.append((os.path.join(root,file), root))
 
-all_imports = collect_submodules('pydantic') + ['dataclasses', 'colorsys']
+all_imports = collect_submodules('pydantic') + ['dataclasses', 'colorsys', 'typing_extensions']
 with open("requirements-build.txt", "r") as reqs:
     for line in reqs:
         package = line.split("=")[0].split(">")[0].split("<")[0].replace('"', '').replace("'", '').strip()