Skip to content

Commit

Permalink
Build with CONFIG+=trik_nopython to exclude Python.h dependency (#1671)
Browse files Browse the repository at this point in the history
* Build with CONFIG+=trik_nopython to exclude Python.h dependency
* [trik-runtime] update. Main feature: user-site Python packages
  • Loading branch information
iakov committed Jul 18, 2023
1 parent 2d9562d commit d904c44
Show file tree
Hide file tree
Showing 15 changed files with 42 additions and 441 deletions.
10 changes: 5 additions & 5 deletions .github/mergeable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ mergeable:
enabled: true
must_include:
regex: '20[0-9][0-9]\.[0-9]+$'
- do: approvals
min:
count: 1
required:
assignees: true
# - do: approvals
# min:
# count: 1
# required:
# assignees: true
# error:
# - do: checks
# status: 'failure'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/centos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ jobs:
timeout-minutes: 5
run: |
cd ${{ env.BUILD_DIR }}
export TRIK_PYTHONPATH=$(python3 -c "import sys; import os; print(os.pathsep.join(sys.path))")
make -k check TESTARGS="-platform offscreen"
- name: Download tests
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ jobs:
timeout-minutes: 5
run: |
cd ${{ env.BUILD_DIR }}
export TRIK_PYTHONPATH=$(cygpath -w "${pythonLocation}/Lib")
mingw32-make -k check
- name: Prepare all dlls
Expand Down
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
qrtest/unitTests/**/target_wrapper.sh
qrtest/unitTests/**/moc_wrapper.sh
qrtest/unitTests/**/rcc_wrapper.sh
/**/target_wrapper.sh
/**/moc_wrapper.sh
/**/rcc_wrapper.sh
#Qt autgenerated resource file for executable
**/*_resource.rc
**/object_script.*
Expand Down
142 changes: 0 additions & 142 deletions .travis.yml

This file was deleted.

Loading

0 comments on commit d904c44

Please sign in to comment.