harelba/q
1
1
Fork 0
mirror of https://github.com/harelba/q.git synced 2024-10-04 06:48:13 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into q-benchmark-merge1

Browse Source
This commit is contained in:
Harel Ben-Attia 2020-08-30 16:42:35 +03:00 committed by GitHub
commit d34d06387d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
do-manual-release.sh
View File

@ -10,11 +10,13 @@ if [[ "$TRAVIS_OS_NAME" == "osx" || "$TRAVIS_OS_NAME" == "linux" ]]
then then
echo "Packing $TRAVIS_OS_NAME installer - packing binary" echo "Packing $TRAVIS_OS_NAME installer - packing binary"
pyci pack --repo harelba/q --sha $VERSION binary pyci pack --repo harelba/q --sha $VERSION binary
pyci pack binary
echo "Packing $TRAVIS_OS_NAME installer - uploading" echo "Packing $TRAVIS_OS_NAME installer - uploading"
pyci github upload-asset --asset q-$(uname -m)-$(uname -s) --release $VERSION pyci github upload-asset --asset q-$(uname -m)-$(uname -s) --release $VERSION
else else
echo "Packing windows installer - packing binary" echo "Packing windows installer - packing binary"
pyci pack --repo harelba/q --sha $VERSION binary pyci pack --repo harelba/q --sha $VERSION binary
pyci pack binary
echo "Packing windows installer - listing files" echo "Packing windows installer - listing files"
find `pwd` -ls | grep -v \.git/ find `pwd` -ls | grep -v \.git/
echo "Packing windows installer - packing nsis" echo "Packing windows installer - packing nsis"

2
test/test-suite
View File

@ -26,6 +26,7 @@ import six
from six.moves import range from six.moves import range
sys.path.append(os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])),'..','bin')) sys.path.append(os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])),'..','bin'))
from q import QTextAsData,QOutput,QOutputPrinter,QInputParams from q import QTextAsData,QOutput,QOutputPrinter,QInputParams
import itertools import itertools
@ -2563,6 +2564,7 @@ class BenchmarkTests(AbstractQTestCase):
return 'octosql -c {} -o table "select count(*) from bmdata a"'.format(config_fn) return 'octosql -c {} -o table "select count(*) from bmdata a"'.format(config_fn)
self._perform_test_performance_matrix('octosql',generate_octosql_cmd) self._perform_test_performance_matrix('octosql',generate_octosql_cmd)
def suite(): def suite():
tl = unittest.TestLoader() tl = unittest.TestLoader()
basic_stuff = tl.loadTestsFromTestCase(BasicTests) basic_stuff = tl.loadTestsFromTestCase(BasicTests)