Skip to content

Commit

Permalink
moving ck and ck.bat to 'scripts' in setup.py; moving condarecipe to …
Browse files Browse the repository at this point in the history
…external sources (to prepare conda packages externally); using $PYTHON on Linux
  • Loading branch information
gfursin committed Sep 26, 2015
1 parent 30f3a58 commit b337f63
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 40 deletions.
6 changes: 6 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
* V1.6.8
* moving ck and ck.bat to 'scripts' in setup.py
* moving condarecipe to external sources
(to prepare conda packages externally)
* using $PYTHON on Linux

* V1.6.7
* fixing 755 for bin/ck (for PIP installation)

Expand Down
8 changes: 4 additions & 4 deletions bin/ck
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ if [ -z "$CK_ROOT" ]; then
fi

# Check which python to use
if [ -z "$CK_PYTHON" ]; then
export CK_PYTHON=python
if [ -z "$PYTHON" ]; then
export PYTHON=python
fi

# Load kernel module (either GIT/local installation or as package)
if [ -f "$CK_ROOT/ck/kernel.py" ]; then
$CK_PYTHON -W ignore::DeprecationWarning $CK_ROOT/ck/kernel.py "$@"
$PYTHON -W ignore::DeprecationWarning $CK_ROOT/ck/kernel.py "$@"
else
$CK_PYTHON -m ck.kernel "$@"
$PYTHON -m ck.kernel "$@"
fi
2 changes: 1 addition & 1 deletion ck/kernel.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
con_encoding='' # Use non-default console encoding

cfg={
"version":["1", "6", "7"],
"version":["1", "6", "8"],

"name":"Collective Knowledge",
"desc":"exposing ad-hoc experimental setups to extensible repository and big data predictive analytics",
Expand Down
2 changes: 0 additions & 2 deletions condarecipe/bld.bat

This file was deleted.

1 change: 0 additions & 1 deletion condarecipe/build.sh

This file was deleted.

26 changes: 0 additions & 26 deletions condarecipe/meta.yaml

This file was deleted.

11 changes: 5 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

setup(
name='ck',
version='1.6.7',
version='1.6.8',
url='https://github.com/ctuning/ck/wiki',
license='BSD 3-clause',
author='Grigori Fursin and non-profit cTuning foundation',
Expand Down Expand Up @@ -54,11 +54,10 @@
'repo/test/unicode/t*',
'repo/test/unicode/.cm/*',
'repo/test/unicode/dir/*']},
data_files=[('Scripts', ['bin/ck',
'bin/ck.bat']),
('bin', ['bin/ck',
'bin/ck.bat'])],
classifiers = [

scripts = ["bin/ck" ,"bin/ck.bat"],

classifiers = [
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Development Status :: 5 - Production/Stable",
Expand Down

0 comments on commit b337f63

Please sign in to comment.