Skip to content

Commit 38f003d

Browse files
committed
New release process (no dev PYTHONPATH)
1 parent b4b5790 commit 38f003d

File tree

4 files changed

+52
-4
lines changed

4 files changed

+52
-4
lines changed

.vscode/tasks.json

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,40 @@
149149
}
150150
},
151151
{
152-
"label": "Upgrade environment",
152+
"label": "Upgrade all packages (!)",
153153
"type": "shell",
154154
"command": "cmd",
155155
"args": [
156156
"/c",
157-
"upgrade_env.bat"
157+
"upgrade_all.bat"
158+
],
159+
"options": {
160+
"cwd": "scripts",
161+
"env": {
162+
"UNATTENDED": "1",
163+
"PYTHON": "${env:CDL_PYTHONEXE}"
164+
}
165+
},
166+
"group": {
167+
"kind": "build",
168+
"isDefault": true
169+
},
170+
"presentation": {
171+
"echo": true,
172+
"reveal": "always",
173+
"focus": false,
174+
"panel": "shared",
175+
"showReuseMessage": true,
176+
"clear": false
177+
}
178+
},
179+
{
180+
"label": "Upgrade PlotPyStack packages",
181+
"type": "shell",
182+
"command": "cmd",
183+
"args": [
184+
"/c",
185+
"upgrade_stack.bat"
158186
],
159187
"options": {
160188
"cwd": "scripts",
@@ -337,6 +365,7 @@
337365
"cwd": "scripts",
338366
"env": {
339367
"PYTHON": "${env:CDL_PYTHONEXE}",
368+
"RELEASE": "1",
340369
"UNATTENDED": "1"
341370
}
342371
},
@@ -356,6 +385,8 @@
356385
"dependsOrder": "sequence",
357386
"dependsOn": [
358387
"Clean Up",
388+
"Upgrade PlotPyStack packages",
389+
"gettext - Compile",
359390
"Build Python packages",
360391
"Create executable",
361392
"Create installer"
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@echo off
22
REM This script was derived from PythonQwt project
33
REM ======================================================
4-
REM Update environment requirements
4+
REM Update all Python required packages
55
REM ======================================================
66
REM Licensed under the terms of the MIT License
77
REM Copyright (c) 2020 Pierre Raybaut
@@ -11,6 +11,6 @@ setlocal
1111
call %~dp0utils GetScriptPath SCRIPTPATH
1212
call %FUNC% UsePython
1313
cd %SCRIPTPATH%\..
14-
pip install --upgrade -r dev\requirements.txt
14+
pip install --upgrade -r requirements.txt
1515
pip list > pip_list.txt
1616
call %FUNC% EndOfScript

scripts/upgrade_stack.bat

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
@echo off
2+
REM This script was derived from PythonQwt project
3+
REM ======================================================
4+
REM Update only PlotPyStack required packages
5+
REM ======================================================
6+
REM Licensed under the terms of the MIT License
7+
REM Copyright (c) 2020 Pierre Raybaut
8+
REM (see PythonQwt LICENSE file for more details)
9+
REM ======================================================
10+
setlocal
11+
call %~dp0utils GetScriptPath SCRIPTPATH
12+
call %FUNC% UsePython
13+
cd %SCRIPTPATH%\..
14+
pip install --upgrade PythonQwt guidata PlotPy
15+
call %FUNC% EndOfScript

scripts/utils.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ REM ======================================================
5353
:SetPythonPath
5454
set ORIGINAL_PYTHONPATH=%PYTHONPATH%
5555
cd %~dp0..
56+
if not defined RELEASE (set RELEASE=0)
57+
if %RELEASE%==1 (goto:eof)
5658
for /F "tokens=*" %%A in (.env) do (
5759
set %%A
5860
)

0 commit comments

Comments
 (0)