mcvsoftware/twblue
1
0
Fork 0
mirror of https://github.com/MCV-Software/TWBlue.git synced 2024-11-26 12:53:12 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #495 from MCV-Software/python310

Browse Source 
Increase Python version to 3.10. Closes #493
This commit is contained in:
Manuel Cortez 2022-11-03 08:53:20 -06:00 committed by GitHub
commit dcfacf8cdd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitlab-ci.yml
View File

@ -1,6 +1,6 @@
variables: variables:
GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_STRATEGY: recursive
PYTHON: "C:\\python37\\python.exe" PYTHON: "C:\\python310\\python.exe"
NSIS: "C:\\program files (x86)\\nsis\\makensis.exe" NSIS: "C:\\program files (x86)\\nsis\\makensis.exe"
stages: stages:
@ -17,9 +17,10 @@ twblue32:
- Set-Variable -Name "time" -Value (date -Format "%H:%m") - Set-Variable -Name "time" -Value (date -Format "%H:%m")
- echo ${time} - echo ${time}
- echo "started by ${GITLAB_USER_NAME}" - 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 -V'
- '&$env:PYTHON -m pip install --upgrade pip' - '&$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' - '&$env:PYTHON -m pip install --upgrade -r requirements.txt'
stage: build stage: build
interruptible: true interruptible: true
@ -56,7 +57,7 @@ twblue64:
- Set-Variable -Name "time" -Value (date -Format "%H:%m") - Set-Variable -Name "time" -Value (date -Format "%H:%m")
- echo ${time} - echo ${time}
- echo "started by ${GITLAB_USER_NAME}" - 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 -V'
- '&$env:PYTHON -m pip install --upgrade pip' - '&$env:PYTHON -m pip install --upgrade pip'
- '&$env:PYTHON -m pip install --upgrade -r requirements.txt' - '&$env:PYTHON -m pip install --upgrade -r requirements.txt'

6
requirements.txt
View File

@ -1,9 +1,8 @@
wxpython==4.1.1 wxpython
wheel wheel
six future
configobj configobj
markdown markdown
future
requests requests
oauthlib oauthlib
requests-oauthlib requests-oauthlib
@ -12,7 +11,6 @@ pypubsub
geopy geopy
arrow arrow
python-dateutil python-dateutil
futures
winpaths winpaths
PySocks PySocks
win_inet_pton win_inet_pton

BIN
src/appkeys.cp37-win32.pyd
View File

Binary file not shown.

BIN
src/appkeys.cp37-win_amd64.pyd
View File

Binary file not shown.