Skip to content

Commit d904c44

Browse files
authored
Build with CONFIG+=trik_nopython to exclude Python.h dependency (#1671)
* Build with CONFIG+=trik_nopython to exclude Python.h dependency * [trik-runtime] update. Main feature: user-site Python packages
1 parent 2d9562d commit d904c44

File tree

15 files changed

+42
-441
lines changed

15 files changed

+42
-441
lines changed

.github/mergeable.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ mergeable:
1313
enabled: true
1414
must_include:
1515
regex: '20[0-9][0-9]\.[0-9]+$'
16-
- do: approvals
17-
min:
18-
count: 1
19-
required:
20-
assignees: true
16+
# - do: approvals
17+
# min:
18+
# count: 1
19+
# required:
20+
# assignees: true
2121
# error:
2222
# - do: checks
2323
# status: 'failure'

.github/workflows/centos.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ jobs:
154154
timeout-minutes: 5
155155
run: |
156156
cd ${{ env.BUILD_DIR }}
157+
export TRIK_PYTHONPATH=$(python3 -c "import sys; import os; print(os.pathsep.join(sys.path))")
157158
make -k check TESTARGS="-platform offscreen"
158159
159160
- name: Download tests

.github/workflows/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ jobs:
167167
timeout-minutes: 5
168168
run: |
169169
cd ${{ env.BUILD_DIR }}
170+
export TRIK_PYTHONPATH=$(cygpath -w "${pythonLocation}/Lib")
170171
mingw32-make -k check
171172
172173
- name: Prepare all dlls

.gitignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
qrtest/unitTests/**/target_wrapper.sh
2-
qrtest/unitTests/**/moc_wrapper.sh
3-
qrtest/unitTests/**/rcc_wrapper.sh
1+
/**/target_wrapper.sh
2+
/**/moc_wrapper.sh
3+
/**/rcc_wrapper.sh
44
#Qt autgenerated resource file for executable
55
**/*_resource.rc
66
**/object_script.*

.travis.yml

Lines changed: 0 additions & 142 deletions
This file was deleted.

0 commit comments

Comments
 (0)