Skip to content

Commit 2e16bcd

Browse files
committed
Use PyKX ~2.5
1 parent bcda140 commit 2e16bcd

File tree

7 files changed

+10
-6
lines changed

7 files changed

+10
-6
lines changed

.github/workflows/dev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ jobs:
6363
username: ${{ secrets.GL_REG_USERNAME }}
6464
password: ${{ secrets.GL_REG_TOKEN }}
6565
- name: Run qCumber
66-
run: ./qcumber.sh -src test/q/main.q -test test/q
66+
run: ./qcumber.sh -src test/q/main.q -test test/q/tests
6767
env:
6868
KDB_K4LICENSE_B64: ${{ secrets.KDB_K4LICENSE_B64 }}
6969

7070

7171
app-sec:
72-
needs: test
72+
needs: [test, test-q]
7373
if: "! github.event.pull_request.head.repo.fork "
7474
uses: ./.github/workflows/app-sec-template.yml
7575
with:

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
retention-days: 1
5454

5555
app-sec:
56-
needs: test
56+
needs: [test, test-q]
5757
if: "! github.event.pull_request.head.repo.fork "
5858
uses: ./.github/workflows/app-sec-template.yml
5959
with:

qcumber.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
QBUILD_IMAGE="registry.gitlab.com/kxdev/cloud/packaging/qpacker/qpbuild:2.1.41"
88
CMD="/app/qbuild/scripts/qcumber -color -q $*"
9-
SETUP="if [ -f /app/project/build/preTest.sh ]; then source /app/project/build/preTest.sh; fi"
9+
SETUP="if [ -f /app/project/test/q/preTest.sh ]; then source /app/project/test/q/preTest.sh; fi"
1010

1111
docker run --rm \
1212
-e KDB_K4LICENSE_B64 \

test/q/preTest.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/bash
2+
3+
pip install "pykx~=2.5"
4+
python -c "import pykx;pykx.install_into_QHOME()"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ feature removeExtraIndents
44
.test.evaluatePy: {[isString; code]
55
0i (.test.src; isString; code; "first"; 10000)
66
};
7-
7+
88
should handle unmatched dedents
99
expect both expressions to be moved to column 0
1010
x: " a = 1 + 2\n",
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ feature list_mem
22
before
33
.ignore.fnStr: "\n" sv read0 `:resources/list_mem.q;
44
// Ignore q namespaces and our temporary setup namespace
5-
.ignore.blacklist: " `.q`.Q`.h`.z`.o`.j`.m`.ignore`.comkxic`.pykx`.p`.s`.foo";
5+
.ignore.blacklist: " `.q`.Q`.h`.z`.o`.j`.m`.ignore`.comkxic`.com_kx_log`.kurl`.pykx`.p`.s`.foo";
66
// Also ignore all of the ax-libraries namespaces
77
.ignore.blacklist,: "`", "`" sv string distinct ` sv/: 2#/: ` vs/: .axenv.modules[];
88

0 commit comments

Comments
 (0)