Skip to content

Commit b337f63

Browse files
committed
moving ck and ck.bat to 'scripts' in setup.py; moving condarecipe to external sources (to prepare conda packages externally); using $PYTHON on Linux
1 parent 30f3a58 commit b337f63

File tree

7 files changed

+16
-40
lines changed

7 files changed

+16
-40
lines changed

CHANGES.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
* V1.6.8
2+
* moving ck and ck.bat to 'scripts' in setup.py
3+
* moving condarecipe to external sources
4+
(to prepare conda packages externally)
5+
* using $PYTHON on Linux
6+
17
* V1.6.7
28
* fixing 755 for bin/ck (for PIP installation)
39

bin/ck

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ if [ -z "$CK_ROOT" ]; then
1010
fi
1111

1212
# Check which python to use
13-
if [ -z "$CK_PYTHON" ]; then
14-
export CK_PYTHON=python
13+
if [ -z "$PYTHON" ]; then
14+
export PYTHON=python
1515
fi
1616

1717
# Load kernel module (either GIT/local installation or as package)
1818
if [ -f "$CK_ROOT/ck/kernel.py" ]; then
19-
$CK_PYTHON -W ignore::DeprecationWarning $CK_ROOT/ck/kernel.py "$@"
19+
$PYTHON -W ignore::DeprecationWarning $CK_ROOT/ck/kernel.py "$@"
2020
else
21-
$CK_PYTHON -m ck.kernel "$@"
21+
$PYTHON -m ck.kernel "$@"
2222
fi

ck/kernel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
con_encoding='' # Use non-default console encoding
2121

2222
cfg={
23-
"version":["1", "6", "7"],
23+
"version":["1", "6", "8"],
2424

2525
"name":"Collective Knowledge",
2626
"desc":"exposing ad-hoc experimental setups to extensible repository and big data predictive analytics",

condarecipe/bld.bat

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

condarecipe/build.sh

Lines changed: 0 additions & 1 deletion
This file was deleted.

condarecipe/meta.yaml

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

setup.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
setup(
1111
name='ck',
12-
version='1.6.7',
12+
version='1.6.8',
1313
url='https://github.com/ctuning/ck/wiki',
1414
license='BSD 3-clause',
1515
author='Grigori Fursin and non-profit cTuning foundation',
@@ -54,11 +54,10 @@
5454
'repo/test/unicode/t*',
5555
'repo/test/unicode/.cm/*',
5656
'repo/test/unicode/dir/*']},
57-
data_files=[('Scripts', ['bin/ck',
58-
'bin/ck.bat']),
59-
('bin', ['bin/ck',
60-
'bin/ck.bat'])],
61-
classifiers = [
57+
58+
scripts = ["bin/ck" ,"bin/ck.bat"],
59+
60+
classifiers = [
6261
"Programming Language :: Python",
6362
"Programming Language :: Python :: 3",
6463
"Development Status :: 5 - Production/Stable",

0 commit comments

Comments
 (0)