From 5ed17b1867027bc2ccf20ceca77b278042366a33 Mon Sep 17 00:00:00 2001 From: Melody Horn Date: Thu, 24 Dec 2020 05:01:01 -0700 Subject: [PATCH 1/9] get ready to wrestle with build infra for three hours --- .travis.yml | 4 ++-- scripts/setup_linux.sh | 3 --- scripts/setup_windows.sh | 8 -------- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1809209..e890ff3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: shell -if: tag IS present +if: tag IS present OR branch = build-fuckery dist: xenial os: - linux @@ -15,7 +15,7 @@ before_install: install: - which python3 && export PYTHON=python3 || export PYTHON=python - echo ${PYTHON} - - ${PYTHON} -m pip install -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-16.04/ -r requirements.txt + - ${PYTHON} -m pip install -r requirements.txt before_deploy: - ${PYTHON} setup.py build - pushd build diff --git a/scripts/setup_linux.sh b/scripts/setup_linux.sh index 4f199b7..2dcd2b1 100644 --- a/scripts/setup_linux.sh +++ b/scripts/setup_linux.sh @@ -1,7 +1,4 @@ #!/usr/bin/env bash set -x -sudo apt-get update -sudo apt-get install -y python3 python3-dev python3-pip python3-setuptools libgtk2.0-dev libgtk-3-dev libjpeg-dev libtiff-dev libsdl1.2-dev libgstreamer-plugins-base0.10-dev libnotify-dev freeglut3 freeglut3-dev libsm-dev libwebkitgtk-dev libwebkitgtk-3.0-dev - set +x diff --git a/scripts/setup_windows.sh b/scripts/setup_windows.sh index 612f10a..2dcd2b1 100644 --- a/scripts/setup_windows.sh +++ b/scripts/setup_windows.sh @@ -1,12 +1,4 @@ #!/usr/bin/env bash set -x -choco install python -curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py -echo $PATH -export PATH=/C/Python37:$PATH -which python -python get-pip.py -python -m pip install --upgrade git+https://github.com/anthony-tuininga/cx_Freeze.git@master - set +x -- GitLab From 180bf74e3c8986de9ee212c8001b7bbae22061b1 Mon Sep 17 00:00:00 2001 From: Melody Horn Date: Thu, 24 Dec 2020 05:05:04 -0700 Subject: [PATCH 2/9] put some things back where they came from --- .travis.yml | 2 ++ scripts/setup_linux.sh | 3 +++ scripts/setup_windows.sh | 7 +++++++ 3 files changed, 12 insertions(+) diff --git a/.travis.yml b/.travis.yml index e890ff3..278f7fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,8 @@ install: - which python3 && export PYTHON=python3 || export PYTHON=python - echo ${PYTHON} - ${PYTHON} -m pip install -r requirements.txt +script: + - ${PYTHON} setup.py build before_deploy: - ${PYTHON} setup.py build - pushd build diff --git a/scripts/setup_linux.sh b/scripts/setup_linux.sh index 2dcd2b1..d1ff045 100644 --- a/scripts/setup_linux.sh +++ b/scripts/setup_linux.sh @@ -1,4 +1,7 @@ #!/usr/bin/env bash set -x +sudo apt-get update +sudo apt-get install -y python3 python3-pip python3-setuptools + set +x diff --git a/scripts/setup_windows.sh b/scripts/setup_windows.sh index 2dcd2b1..30fec7a 100644 --- a/scripts/setup_windows.sh +++ b/scripts/setup_windows.sh @@ -1,4 +1,11 @@ #!/usr/bin/env bash set -x +choco install python +curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py +echo $PATH +export PATH=/C/Python37:$PATH +which python +python get-pip.py + set +x -- GitLab From b78e4f4fdfe353835d0fc95eb7ff866ea4b6e2c3 Mon Sep 17 00:00:00 2001 From: Melody Horn Date: Thu, 24 Dec 2020 05:23:26 -0700 Subject: [PATCH 3/9] juggle more dependency stuff --- .travis.yml | 9 +++++++-- scripts/setup_linux.sh | 3 --- scripts/setup_windows.sh | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 278f7fa..d5f96eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,19 @@ language: shell if: tag IS present OR branch = build-fuckery -dist: xenial +dist: bionic os: - linux - osx - windows addons: + apt: + packages: + - python3.7 + - python3-pip + - python3-tk homebrew: packages: - - python + - python@3.7 before_install: - chmod +x scripts/setup_${TRAVIS_OS_NAME}.sh - . scripts/setup_${TRAVIS_OS_NAME}.sh diff --git a/scripts/setup_linux.sh b/scripts/setup_linux.sh index d1ff045..2dcd2b1 100644 --- a/scripts/setup_linux.sh +++ b/scripts/setup_linux.sh @@ -1,7 +1,4 @@ #!/usr/bin/env bash set -x -sudo apt-get update -sudo apt-get install -y python3 python3-pip python3-setuptools - set +x diff --git a/scripts/setup_windows.sh b/scripts/setup_windows.sh index 30fec7a..734b1a5 100644 --- a/scripts/setup_windows.sh +++ b/scripts/setup_windows.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -x -choco install python +choco install python --version 3.7.9 -y curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py echo $PATH export PATH=/C/Python37:$PATH -- GitLab From 39cd6b2f45078c960d54ebc06462f24aa2639ea3 Mon Sep 17 00:00:00 2001 From: Melody Horn Date: Thu, 24 Dec 2020 05:27:33 -0700 Subject: [PATCH 4/9] it's always something --- .travis.yml | 1 + scripts/setup_windows.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d5f96eb..c75aa73 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ addons: packages: - python3.7 - python3-pip + - python3-setuptools - python3-tk homebrew: packages: diff --git a/scripts/setup_windows.sh b/scripts/setup_windows.sh index 734b1a5..adee52e 100644 --- a/scripts/setup_windows.sh +++ b/scripts/setup_windows.sh @@ -3,9 +3,9 @@ set -x choco install python --version 3.7.9 -y curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py -echo $PATH export PATH=/C/Python37:$PATH which python python get-pip.py +ls /C/Python37/DLLs set +x -- GitLab From 1c379960d62431da6b68631fd9f720d0def3d17a Mon Sep 17 00:00:00 2001 From: Melody Horn Date: Thu, 24 Dec 2020 05:36:53 -0700 Subject: [PATCH 5/9] use correct python --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c75aa73..1d9925c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,9 @@ before_install: - chmod +x scripts/setup_${TRAVIS_OS_NAME}.sh - . scripts/setup_${TRAVIS_OS_NAME}.sh install: - - which python3 && export PYTHON=python3 || export PYTHON=python + - which python && export PYTHON=python + - which python3 && export PYTHON=python3 + - which python3.7 && export PYTHON=python3.7 - echo ${PYTHON} - ${PYTHON} -m pip install -r requirements.txt script: -- GitLab From a3b37b773e4346c27a06346787b8cec0c2b8c735 Mon Sep 17 00:00:00 2001 From: Melody Horn Date: Thu, 24 Dec 2020 05:37:04 -0700 Subject: [PATCH 6/9] look harder for the correct DLLs fml --- setup.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index cf45e97..92300c8 100644 --- a/setup.py +++ b/setup.py @@ -11,10 +11,14 @@ buildOptions = dict(packages=[], excludes=[]) PYTHON_INSTALL_DIR = os.path.dirname(os.path.dirname(os.__file__)) if sys.platform == "win32": - buildOptions['include_files'] = [ - os.path.join(PYTHON_INSTALL_DIR, 'DLLs', 'libcrypto-1_1-x64.dll'), - os.path.join(PYTHON_INSTALL_DIR, 'DLLs', 'libssl-1_1-x64.dll'), - ] + dlls_folder = os.path.join(PYTHON_INSTALL_DIR, 'DLLs') + targets = ['libcrypto', 'libssl'] + include_files = [] + for dll in os.listdir(dlls_folder): + for target in targets: + if target.startswith(target): + include_files.append(os.path.join(dlls_folder, dll)) + buildOptions['include_files'] = include_files base = 'Win32GUI' if sys.platform == 'win32' else None -- GitLab From eaac8801dedbd063637b15b227fb2d13fb21e075 Mon Sep 17 00:00:00 2001 From: Melody Horn Date: Thu, 24 Dec 2020 05:40:40 -0700 Subject: [PATCH 7/9] correctly disable sh -x --- scripts/setup_linux.sh | 4 ++-- scripts/setup_osx.sh | 4 ++-- scripts/setup_windows.sh | 6 ++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/scripts/setup_linux.sh b/scripts/setup_linux.sh index 2dcd2b1..18c499a 100644 --- a/scripts/setup_linux.sh +++ b/scripts/setup_linux.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash -set -x - set +x + +set -x diff --git a/scripts/setup_osx.sh b/scripts/setup_osx.sh index 2dcd2b1..18c499a 100644 --- a/scripts/setup_osx.sh +++ b/scripts/setup_osx.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash -set -x - set +x + +set -x diff --git a/scripts/setup_windows.sh b/scripts/setup_windows.sh index adee52e..dd5341c 100644 --- a/scripts/setup_windows.sh +++ b/scripts/setup_windows.sh @@ -1,11 +1,9 @@ #!/usr/bin/env bash -set -x +set +x choco install python --version 3.7.9 -y curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py export PATH=/C/Python37:$PATH -which python python get-pip.py -ls /C/Python37/DLLs -set +x +set -x -- GitLab From 64fc46aba07271e4959f8efa58865b18571b20e7 Mon Sep 17 00:00:00 2001 From: Melody Horn Date: Thu, 24 Dec 2020 05:40:59 -0700 Subject: [PATCH 8/9] i swear to fuckin christ --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1d9925c..9170c28 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,9 +19,9 @@ before_install: - chmod +x scripts/setup_${TRAVIS_OS_NAME}.sh - . scripts/setup_${TRAVIS_OS_NAME}.sh install: - - which python && export PYTHON=python - - which python3 && export PYTHON=python3 - - which python3.7 && export PYTHON=python3.7 + - which python && export PYTHON=python || echo whatever + - which python3 && export PYTHON=python3 || echo whatever + - which python3.7 && export PYTHON=python3.7 || echo whatever - echo ${PYTHON} - ${PYTHON} -m pip install -r requirements.txt script: -- GitLab From 1f9422539670bbfbcea2083c457dc8075402da1d Mon Sep 17 00:00:00 2001 From: Melody Horn Date: Thu, 24 Dec 2020 05:46:38 -0700 Subject: [PATCH 9/9] bdg voice i am going to throw myself into the sea --- .travis.yml | 1 + scripts/setup_linux.sh | 3 --- scripts/setup_osx.sh | 3 --- scripts/setup_windows.sh | 4 ---- 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9170c28..7ff4c8d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ addons: apt: packages: - python3.7 + - python3.7-dev - python3-pip - python3-setuptools - python3-tk diff --git a/scripts/setup_linux.sh b/scripts/setup_linux.sh index 18c499a..f1f641a 100644 --- a/scripts/setup_linux.sh +++ b/scripts/setup_linux.sh @@ -1,4 +1 @@ #!/usr/bin/env bash -set +x - -set -x diff --git a/scripts/setup_osx.sh b/scripts/setup_osx.sh index 18c499a..f1f641a 100644 --- a/scripts/setup_osx.sh +++ b/scripts/setup_osx.sh @@ -1,4 +1 @@ #!/usr/bin/env bash -set +x - -set -x diff --git a/scripts/setup_windows.sh b/scripts/setup_windows.sh index dd5341c..a8da537 100644 --- a/scripts/setup_windows.sh +++ b/scripts/setup_windows.sh @@ -1,9 +1,5 @@ #!/usr/bin/env bash -set +x - choco install python --version 3.7.9 -y curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py export PATH=/C/Python37:$PATH python get-pip.py - -set -x -- GitLab