Update

StatisKit · Oct 3, 2017 · 98d7ad3 · 98d7ad3
1 parent 69d65b7
commit 98d7ad3
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 228 deletions.
diff --git a/SConstruct b/SConstruct
diff --git a/bin/conda/SConscript b/bin/conda/SConscript
diff --git a/bin/conda/python-autowig/bld.bat b/bin/conda/python-autowig/bld.bat
@@ -3,33 +3,9 @@ echo ON
 if "%PY3K%" == "1" (
   2to3 -n -w %SRC_DIR%\src\py\autowig
   2to3 -n -w %SRC_DIR%\test
-  2to3 -n -w %RECIPE_DIR%\wig.py
 )
 
-python setup.py install --prefix=%PREFIX%
-if errorlevel 1 exit 1
-rem if exist %SP_DIR%\AutoWIG move %SP_DIR%\AutoWIG %SP_DIR%\autowig /s /q
-if not exist %SP_DIR%\autowig\site mkdir %SP_DIR%\autowig\site
-if errorlevel 1 exit 1
-if not exist %SP_DIR%\autowig\site\__init__.py type NUL > %SP_DIR%\autowig\site\__init__.py
-if errorlevel 1 exit 1
-if not exist %SP_DIR%\autowig\site\ASG mkdir %SP_DIR%\autowig\site\ASG
-if errorlevel 1 exit 1
-if not exist %SP_DIR%\autowig\site\parser mkdir %SP_DIR%\autowig\site\parser
-if errorlevel 1 exit 1
-if not exist %SP_DIR%\autowig\site\parser\__init__.py type NUL > %SP_DIR%\autowig\site\parser\__init__.py
-if errorlevel 1 exit 1
-if not exist %SP_DIR%\autowig\site\controller mkdir %SP_DIR%\autowig\site\controller
-if errorlevel 1 exit 1
-if not exist %SP_DIR%\autowig\site\controller\__init__.py type NUL > %SP_DIR%\autowig\site\controller\__init__.py
-if errorlevel 1 exit 1
-if not exist %SP_DIR%\autowig\site\generator mkdir %SP_DIR%\autowig\site\generator
-if errorlevel 1 exit 1
-if not exist %SP_DIR%\autowig\site\generator\__init__.py type NUL > %SP_DIR%\autowig\site\generator\__init__.py
-if errorlevel 1 exit 1
-if not exist %SP_DIR%\SCons\site_scons\site_tools mkdir %SP_DIR%\SCons\site_scons\site_tools
-if errorlevel 1 exit 1
-copy %RECIPE_DIR%\wig.py %SP_DIR%\SCons\site_scons\site_tools\wig.py
+%PYTHON% setup.py install --prefix=%PREFIX%
 if errorlevel 1 exit 1
 
 echo OFF
diff --git a/bin/conda/python-autowig/build.sh b/bin/conda/python-autowig/build.sh
@@ -3,21 +3,8 @@ set -ev
 if [[ "$PY3K" = 1 ]]; then
   2to3 -n -w $SRC_DIR/src/py/autowig
   2to3 -n -w $SRC_DIR/test
-  2to3 -n -w $RECIPE_DIR/wig.py
 fi
 
 $PYTHON setup.py install --prefix=$PREFIX
-mkdir -p $SP_DIR/autowig/site
-touch $SP_DIR/autowig/site/__init__.py
-mkdir -p $SP_DIR/autowig/site/ASG
-mkdir -p $SP_DIR/autowig/site/parser
-touch $SP_DIR/autowig/site/parser/__init__.py
-mkdir -p $SP_DIR/autowig/site/controller
-touch $SP_DIR/autowig/site/controller/__init__.py
-mkdir -p $SP_DIR/autowig/site/generator
-touch $SP_DIR/autowig/site/generator/__init__.py
-
-mkdir -p $SP_DIR/SCons/site_scons/site_tools
-cp $RECIPE_DIR/wig.py $SP_DIR/SCons/site_scons/site_tools/wig.py
 
 set +ev
diff --git a/bin/conda/python-autowig/meta.yaml b/bin/conda/python-autowig/meta.yaml
@@ -1,19 +1,3 @@
-##################################################################################
-#                                                                                #
-# AutoWIG: Automatic Wrapper and Interface Generator                             #
-#                                                                                #
-# Homepage: http://autowig.readthedocs.io                                        #
-#                                                                                #
-# Copyright (c) 2016 Pierre Fernique                                             #
-#                                                                                #
-# This software is distributed under the CeCILL license. You should have       #
-# received a copy of the legalcode along with this work. If not, see             #
-# <http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.html>.                 #
-#                                                                                #
-# File authors: Pierre Fernique <pfernique@gmail.com> (43)                       #
-#                                                                                #
-##################################################################################
-
 package:
   name: python-autowig
   version: "1.0.0"
@@ -26,12 +10,12 @@ build:
 
 about:
   home: http://autowig.readthedocs.org
-  license: CeCILL
+  license: Apache License 2.0
 
 requirements:
   build:
     - python
-    - python-dev
+    - python-toolchain
   run:
     - python
     - mako
@@ -51,8 +35,8 @@ test:
     - src
   requires:
     - python
-    - libdev
-    - python-dev
+    - libtoolchain
+    - python-toolchain
     - clang
     - python-clanglite
     - git

diff --git a/bin/conda/python-autowig/wig.py b/bin/conda/python-autowig/wig.py
diff --git a/doc/examples/basic/conda/libbasic/meta.yaml b/doc/examples/basic/conda/libbasic/meta.yaml
@@ -33,6 +33,6 @@ about:
 
 requirements:
     build:
-        - libdev
+        - libtoolchain
     run:
-        - librun
+        - libruntime
diff --git a/doc/examples/basic/conda/python-basic/meta.yaml b/doc/examples/basic/conda/python-basic/meta.yaml
@@ -33,13 +33,13 @@ about:
 
 requirements:
     build:
-        - libdev
-        - python-dev
+        - libtoolchain
+        - python-toolchain
         - python
         - libboost
         - libbasic
     run:
-        - librun
+        - libruntime
         - python
         - libboost
         - libbasic

diff --git a/src/py/autowig/boost_python_generator.py b/src/py/autowig/boost_python_generator.py
@@ -392,7 +392,6 @@ class BoostPythonExportDefaultFileProxy(BoostPythonExportFileProxy):
     % else:
         % for enumerator in enumeration.enumerators:
             % if enumerator.boost_python_export:
-
     enum_${enumeration.hash}.value("${node_rename(enumerator)}", ${enumerator.globalname[::-1].replace((enumeration.localname + '::')[::-1], '', 1)[::-1]});
             % endif
         % endfor
@@ -1502,15 +1501,15 @@ def boost_python_generator(asg, nodes, module='./module.cpp', decorator=None, **
 
     return module
 
-def boost_python_pattern_generator(asg, pattern=None, **kwargs):
+def boost_python_pattern_generator(asg, pattern=None, *args, **kwargs):
     """
     """
-    return boost_python_generator(asg, asg.declarations(pattern=pattern), **kwargs)
+    return boost_python_generator(asg, asg.declarations(pattern=pattern), *args, **kwargs)
 
 
-def boost_python_internal_generator(asg, pattern=None, **kwargs):
+def boost_python_internal_generator(asg, pattern=None, *args, **kwargs):
     """
     """
     return boost_python_generator(asg,
                                   [node for node in asg.declarations(pattern=pattern) if not getattr(node.header, 'is_external_dependency', True)],
-                                  **kwargs)
+                                  *args, **kwargs)
diff --git a/travis.yml b/travis.yml
@@ -5,20 +5,12 @@ os:
   - osx
 
 sudo: required
-
-services:
-  - docker
 
 env:
   - CONDA_RECIPE=python-autowig
     CONDA_VERSION=2
   - CONDA_RECIPE=python-autowig
     CONDA_VERSION=3
-
-matrix:
-  exclude:
-  - os: osx
-    env: DOCKERFILE=autowig
 
 install:
   - git clone https://github.com/StatisKit/travis-ci.git travis-ci