From 2bfee587d306402708221f2390fb02dedff6caea Mon Sep 17 00:00:00 2001
From: yum <yum.food.vr@gmail.com>
Date: Mon, 23 Jan 2023 14:55:36 -0800
Subject: Bugfix: Use future 0.18.2 instead of 0.18.3

Whisper doesn't like 0.18.3, so downgrade to the last version.
---
 GUI/.gitignore        |  2 ++
 GUI/GUI/GUI/Frame.cpp |  3 +++
 GUI/package.ps1       | 24 ------------------------
 3 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/GUI/.gitignore b/GUI/.gitignore
index 45ea261..a7fb099 100644
--- a/GUI/.gitignore
+++ b/GUI/.gitignore
@@ -4,3 +4,5 @@ TaSTT.zip
 
 # ignore net-fetched dependencies
 PortableGit*
+Python*
+python-*
diff --git a/GUI/GUI/GUI/Frame.cpp b/GUI/GUI/GUI/Frame.cpp
index 3ce6603..fed07eb 100644
--- a/GUI/GUI/GUI/Frame.cpp
+++ b/GUI/GUI/GUI/Frame.cpp
@@ -743,7 +743,10 @@ void Frame::OnSetupPython(wxCommandEvent& event)
         }
     }
 
+    // TODO(yum) do this in a requirements.txt and run this command
+    // asynchronously so the GUI doesn't hang
     const std::vector<std::string> pip_deps{
+        "future==0.18.2",
         "openvr",
         "pillow",
         "pyaudio",
diff --git a/GUI/package.ps1 b/GUI/package.ps1
index 0fb5486..93bd01c 100644
--- a/GUI/package.ps1
+++ b/GUI/package.ps1
@@ -63,30 +63,6 @@ if (-Not (Test-Path $git_dir)) {
   Read-Host -Prompt "Press enter once PortableGit is installed at $pwd\PortableGit"
 }
 
-$future_version = "0.18.3"
-$future_path = "future-$future_version.tar.gz"
-if (-Not (Test-Path $future_path)) {
-  # Source: https://pypi.org/project/future/#files
-  $FUTURE_0_18_3_URL = "https://files.pythonhosted.org/packages/8f/2e/cf6accf7415237d6faeeebdc7832023c90e0282aa16fd3263db0eb4715ec/future-0.18.3.tar.gz"
-  $FUTURE_URL = $FUTURE_0_18_3_URL
-  $FUTURE_FILE = $(Split-Path -Path $FUTURE_URL -Leaf)
-
-  if (-Not (Test-Path $FUTURE_FILE)) {
-    Invoke-WebRequest $FUTURE_URL -OutFile $FUTURE_FILE
-  }
-  if (-Not (Test-Path Python/Dependencies)) {
-    mkdir Python/Dependencies
-  }
-  if (-Not (Test-Path Python/Dependencies/future-$future_version)) {
-    mkdir Python/Dependencies/future-$future_version
-  }
-  pushd Python/Dependencies >$null
-  tar -xvzf ../../$FUTURE_FILE
-  popd >$null
-
-  echo "Dependencies/future-$future_version" >> Python/python310._pth
-}
-
 mkdir $install_dir > $null
 mkdir $install_dir/Resources > $null
 cp -Recurse ../Animations TaSTT/Resources/Animations
-- 
cgit v1.2.3