Skip to content

Commit 1209611

Browse files
author
arch
committed
update windows dependencies
1 parent e752f4e commit 1209611

File tree

6 files changed

+97
-41
lines changed

6 files changed

+97
-41
lines changed

‎.github/workflows/prerelease_windows_application.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Setup Miniconda
1919
uses: conda-incubator/setup-miniconda@v2
2020
with:
21-
activate-environment: build
21+
activate-environment: python-funscript-editor
2222
environment-file: environment_windows.yaml
2323
python-version: 3.9
2424
auto-activate-base: false

‎.github/workflows/release_windows_application.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Setup Miniconda
2121
uses: conda-incubator/setup-miniconda@v2
2222
with:
23-
activate-environment: build
23+
activate-environment: python-funscript-editor
2424
environment-file: environment_windows.yaml
2525
python-version: 3.9
2626
auto-activate-base: false

‎build.bat‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,26 @@
11
@echo off
2+
23
rmdir /Q /S "build" 2>NUL
34
rmdir /Q /S "dist/funscript-editor" 2>NUL
45
del "dist\\funscript-editor.zip" 2>NUL
56
del funscript-editor.spec 2>NUL
7+
8+
9+
set CONDAPATH=%USERPROFILE%\Miniconda3
10+
set ENVNAME=python-funscript-editor
11+
12+
if %ENVNAME%==base (set ENVPATH=%CONDAPATH%) else (set ENVPATH=%CONDAPATH%\envs\%ENVNAME%)
13+
14+
call %CONDAPATH%\Scripts\activate.bat base
15+
16+
if exist %ENVPATH% (
17+
conda env update --name %ENVNAME& --file environment_windows.yaml --prune
18+
) else (
19+
conda env create -f environment_windows.yaml --name %ENVNAME%
20+
)
21+
22+
conda activate %ENVNAME%
23+
624
cd docs/app
725
mkdocs build
826
cd ../..
@@ -14,3 +32,4 @@ copy /Y "contrib\\Installer\\assets\\main.lua" "dist\\funscript-editor\\OFS"
1432
copy /Y "contrib\\Installer\\assets\\json.lua" "dist\\funscript-editor\\OFS"
1533
powershell Compress-Archive -LiteralPath "dist/funscript-editor" -DestinationPath "dist/funscript-editor.zip"
1634

35+
conda deactivate

‎build_v2.bat‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
@echo off
2+
3+
rmdir /Q /S "build" 2>NUL
4+
rmdir /Q /S "dist/funscript-editor" 2>NUL
5+
del "dist\\funscript-editor.zip" 2>NUL
6+
del funscript-editor.spec 2>NUL
7+
8+
set CONDAPATH=%USERPROFILE%\Miniconda3
9+
set ENVNAME=python-funscript-editor
10+
11+
if %ENVNAME%==base (set ENVPATH=%CONDAPATH%) else (set ENVPATH=%CONDAPATH%\envs\%ENVNAME%)
12+
13+
call %CONDAPATH%\Scripts\activate.bat base
14+
15+
if exist %ENVPATH% (
16+
call conda env update --name %ENVNAME% --file environment_windows.yaml --prune
17+
) else (
18+
call conda env create -f environment_windows.yaml --name %ENVNAME%
19+
)
20+
21+
call conda activate %ENVNAME%
22+
23+
cd docs/app
24+
mkdocs build
25+
cd ../..
26+
pyinstaller --add-data="funscript_editor/config/*;funscript_editor/config/" --add-data="assets/*;./" --hidden-import "pynput.keyboard._win32" --hidden-import "pynput.mouse._win32" --noupx --icon=icon.ico funscript-editor.py
27+
move "docs\\app\\site" "dist\\funscript-editor\\funscript_editor\\docs"
28+
copy /Y "funscript_editor\\VERSION.txt" "dist\\funscript-editor\\funscript_editor"
29+
md "dist\\funscript-editor\\OFS"
30+
copy /Y "contrib\\Installer\\assets\\main.lua" "dist\\funscript-editor\\OFS"
31+
copy /Y "contrib\\Installer\\assets\\json.lua" "dist\\funscript-editor\\OFS"
32+
powershell Compress-Archive -LiteralPath "dist/funscript-editor" -DestinationPath "dist/funscript-editor.zip"
33+
34+
call conda deactivate
35+
timeout 20 >NUL

‎docs/app/docs/user-guide/build.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ First download and install [miniconda](https://docs.conda.io/en/latest/miniconda
1010

1111
```
1212
conda env create -f environment_windows.yaml
13-
conda activate build
13+
conda activate python-funscript-editor
1414
build.bat
1515
```
1616

1717
This create the Windows executable in `./dist`.
1818

19-
Finally you can remove the build environment with `conda env remove -n build`
19+
Finally you can remove the build environment with `conda env remove -n python-funscript-editor`
2020

2121
## Ubuntu 20.04 LTS, Ubuntu 21.04, Debian
2222

‎environment_windows.yaml‎

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
name: build
1+
name: python-funscript-editor
22
channels:
33
- defaults
44
dependencies:
55
- blas=1.0=mkl
6-
- ca-certificates=2021.5.25=haa95532_1
7-
- certifi=2021.5.30=py39haa95532_0
6+
- ca-certificates=2022.10.11=haa95532_0
7+
- certifi=2022.12.7=py39haa95532_0
88
- freetype=2.10.4=hd328e21_0
99
- icc_rt=2019.0.0=h0cc432a_1
1010
- icu=58.2=ha925a31_3
@@ -20,10 +20,11 @@ dependencies:
2020
- numpy=1.20.2=py39ha4e8547_0
2121
- numpy-base=1.20.2=py39hc2deb75_0
2222
- olefile=0.46=py_0
23-
- openssl=1.1.1k=h2bbff1b_0
23+
- openssl=1.1.1s=h2bbff1b_0
2424
- pillow=8.2.0=py39h4fa10fc_0
2525
- pip=21.1.2=py39haa95532_0
2626
- pyqt=5.9.2=py39hd77b12b_6
27+
- pyqtgraph=0.11.0=py_0
2728
- python=3.9.5=h6244533_3
2829
- pyyaml=5.4.1=py39h2bbff1b_1
2930
- qt=5.9.7=vc14h73c81de_0
@@ -43,36 +44,37 @@ dependencies:
4344
- zlib=1.2.11=h62dcd97_4
4445
- zstd=1.4.9=h19a0ad4_0
4546
- pip:
46-
- altgraph==0.17
47-
- click==8.0.1
48-
- colorama==0.4.4
49-
- coloredlogs==15.0.1
50-
- cycler==0.10.0
51-
- future==0.18.2
52-
- ghp-import==2.0.1
53-
- humanfriendly==9.2
54-
- importlib-metadata==4.6.1
55-
- jinja2==3.0.1
56-
- kiwisolver==1.3.1
57-
- markdown==3.3.4
58-
- markupsafe==2.0.1
59-
- matplotlib==3.4.2
60-
- mergedeep==1.3.4
61-
- mkdocs==1.2.1
62-
- opencv-contrib-python==4.5.2.54
63-
- packaging==21.0
64-
- pefile==2021.5.24
65-
- playsound==1.3.0
66-
- pyinstaller==4.7
67-
- pyinstaller-hooks-contrib==2021.2
68-
- pynput==1.7.3
69-
- pyparsing==2.4.7
70-
- pyreadline==2.1
71-
- python-dateutil==2.8.1
72-
- python-mpv==0.5.2
73-
- pywin32-ctypes==0.2.0
74-
- pyyaml-env-tag==0.1
75-
- screeninfo==0.6.7
76-
- watchdog==2.1.3
77-
- zipp==3.5.0
78-
prefix: C:\Users\win10\miniconda3\envs\build
47+
- altgraph==0.17
48+
- click==8.0.1
49+
- colorama==0.4.4
50+
- coloredlogs==15.0.1
51+
- cycler==0.10.0
52+
- future==0.18.2
53+
- ghp-import==2.0.1
54+
- humanfriendly==9.2
55+
- importlib-metadata==4.6.1
56+
- jinja2==3.0.1
57+
- kiwisolver==1.3.1
58+
- markdown==3.3.4
59+
- markupsafe==2.0.1
60+
- matplotlib==3.4.2
61+
- mergedeep==1.3.4
62+
- mkdocs==1.2.1
63+
- opencv-contrib-python==4.5.2.54
64+
- packaging==21.0
65+
- pefile==2021.5.24
66+
- playsound==1.3.0
67+
- pyinstaller==4.7
68+
- pyinstaller-hooks-contrib==2021.2
69+
- pynput==1.7.3
70+
- pyparsing==2.4.7
71+
- pyreadline==2.1
72+
- python-dateutil==2.8.1
73+
- python-mpv==0.5.2
74+
- pywin32-ctypes==0.2.0
75+
- pyyaml-env-tag==0.1
76+
- screeninfo==0.6.7
77+
- simplification==0.6.2
78+
- watchdog==2.1.3
79+
- zipp==3.5.0
80+
prefix: C:\Users\win11\miniconda3\envs\python-funscript-editor

0 commit comments

Comments
 (0)