Add without comments, don't speak about it

StatisKit · Mar 1, 2019 · 0019a67 · 0019a67
1 parent 902637c
commit 0019a67
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 21 deletions.
diff --git a/etc/conda/python-statiskit_core/bld.bat b/etc/conda/python-statiskit_core/bld.bat
@@ -1,10 +1,5 @@
 echo ON
 
-if "%PY3K%" == "1" (
-  2to3 -n -w %SRC_DIR%\src\py\autowig
-  2to3 -n -w %SRC_DIR%\test
-)
-
 scons py --prefix=%LIBRARY_PREFIX% -j%CPU_COUNT% --arch=%ARCH%
 if errorlevel 1 exit 1
 

diff --git a/etc/conda/python-statiskit_core/build.sh b/etc/conda/python-statiskit_core/build.sh
@@ -1,10 +1,5 @@
 set -ve
 
-if [[ "$PY3K" = "1" ]]; then
-  2to3 -n -w $SRC_DIR/src/py/statiskit
-  2to3 -n -w $SRC_DIR/test
-fi
-
-scons py --prefix=$PREFIX -j$CPU_COUNT
+scons py --prefix=${PREFIX} -j${CPU_COUNT}
 
 set +ve
diff --git a/etc/conda/python-statiskit_core/meta.yaml b/etc/conda/python-statiskit_core/meta.yaml
@@ -1,28 +1,33 @@
 package:
   name: python-statiskit_core
-  version: "1.0.0"
+  version: {{ GIT_DESCRIBE_VERSION }}
 
 source:
   path: ../../..
 
 build:
-  number: 0
+  number: {{ GIT_DESCRIBE_NUMBER }}
 
 about:
   home: http://statiskit-core.readthedocs.io
   license: Apache License 2.0
 
 requirements:
   build:
+    - {{ compiler('c') }}
+    - {{ compiler('cxx') }}
     - libtoolchain
     - python-toolchain
-    - libboost_python-dev
-    - libstatiskit_core
+  host:
+    - libpybind11-dev
+    - libstatiskit_stl-dev
+    - libstatiskit_stl
+    - libstatiskit_linalg-dev
+    - libstatiskit_linalg
     - python
   run:
-    - libstatiskit_core
-    - python-statiskit_linalg
-    - python-statiskit_stl
+    - {{ pin_compatible('libstatiskit_stl', exact=True) }}
+    - {{ pin_compatible('libstatiskit_linalg', exact=True) }}
     - python
 
 test:                                               

diff --git a/src/cpp/AutoWIG.py b/src/cpp/AutoWIG.py
@@ -1,7 +1,4 @@
 def controller(asg):
     from scons_tools.site_autowig.controller.statiskit_stl import controller as stl_controller
     asg = stl_controller(asg, library=False)
-    # import pdb
-    # pdb.set_trace()
-    # node = 'class ::statiskit::Selection< struct ::statiskit::DiscreteUnivariateDistribution, struct ::statiskit::DiscreteUnivariateDistributionEstimation >::Estimator'
     return asg