diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c3c846f4..0579a18f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ variables: GIT_SUBMODULE_STRATEGY: recursive - PYTHON: "C:\\python37\\python.exe" + PYTHON: "C:\\python310\\python.exe" NSIS: "C:\\program files (x86)\\nsis\\makensis.exe" stages: @@ -17,9 +17,10 @@ twblue32: - Set-Variable -Name "time" -Value (date -Format "%H:%m") - echo ${time} - echo "started by ${GITLAB_USER_NAME}" - - choco install python --version 3.7.9 -y -ForceX86 + - choco install python --version 3.10.8 -y -ForceX86 - '&$env:PYTHON -V' - '&$env:PYTHON -m pip install --upgrade pip' + - '&$env:PYTHON -m pip install --upgrade https://github.com/josephsl/wxpy32whl/blob/main/wxPython-4.2.0-cp310-cp310-win32.whl?raw=true' - '&$env:PYTHON -m pip install --upgrade -r requirements.txt' stage: build interruptible: true @@ -56,7 +57,7 @@ twblue64: - Set-Variable -Name "time" -Value (date -Format "%H:%m") - echo ${time} - echo "started by ${GITLAB_USER_NAME}" - - choco install python --version 3.7.9 -y + - choco install python --version 3.10.8 -y - '&$env:PYTHON -V' - '&$env:PYTHON -m pip install --upgrade pip' - '&$env:PYTHON -m pip install --upgrade -r requirements.txt' diff --git a/requirements.txt b/requirements.txt index 20b54494..0e74d9a9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,8 @@ -wxpython==4.1.1 +wxpython wheel -six +future configobj markdown -future requests oauthlib requests-oauthlib @@ -12,7 +11,6 @@ pypubsub geopy arrow python-dateutil -futures winpaths PySocks win_inet_pton diff --git a/src/appkeys.cp37-win32.pyd b/src/appkeys.cp37-win32.pyd deleted file mode 100644 index 46ae5afe..00000000 Binary files a/src/appkeys.cp37-win32.pyd and /dev/null differ diff --git a/src/appkeys.cp37-win_amd64.pyd b/src/appkeys.cp37-win_amd64.pyd deleted file mode 100644 index c19fc7d7..00000000 Binary files a/src/appkeys.cp37-win_amd64.pyd and /dev/null differ