Skip to content

Commit

Permalink
Merge pull request #18 from pfernique/master
Browse files Browse the repository at this point in the history
Update wrappers
  • Loading branch information
pfernique committed May 10, 2017
2 parents 7851594 + 9c5c440 commit 70cd7a0
Show file tree
Hide file tree
Showing 26 changed files with 1,250 additions and 1,251 deletions.
22 changes: 11 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
doc/html
doc/latex
doc/Doxyfile
build
*.so
*.pyc
*~
.sconsign.dblite
ASG.pkl
.~lock.*
*.sublime-workspace
doc/html
doc/latex
doc/Doxyfile
build
*.so
*.pyc
*~
.sconsign.dblite
ASG.pkl
.~lock.*
*.sublime-workspace
.coverage
1,054 changes: 527 additions & 527 deletions LICENSE.rst

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
**StatisKit-STL**: Standard Template Library interfaces
#######################################################

The **STL** is a C++ template library providing four components called algorithms, containers, functional, and iterators.

This repository is not a repository for the **STL** source code but for source code implementing scripting languages interfaces for the **STL** library.
**StatisKit-STL**: Standard Template Library interfaces
#######################################################

The **STL** is a C++ template library providing four components called algorithms, containers, functional, and iterators.

This repository is not a repository for the **STL** source code but for source code implementing scripting languages interfaces for the **STL** library.
28 changes: 14 additions & 14 deletions SConstruct
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# -*-python-*-

import os

env = Environment(tools = ['toolchain'])

VariantDir(os.path.join('build', 'src'), 'src')
VariantDir(os.path.join('build', 'test'), 'test')

SConscript(os.path.join('build', 'src', 'cpp', 'SConscript'), exports="env")
SConscript(os.path.join('build', 'src', 'py', 'SConscript'), exports="env")
SConscript(os.path.join('build', 'test', 'SConscript'), exports="env")
SConscript(os.path.join('conda', 'SConscript'), exports="env")

# -*-python-*-

import os

env = Environment(tools = ['toolchain'])

VariantDir(os.path.join('build', 'src'), 'src')
VariantDir(os.path.join('build', 'test'), 'test')

SConscript(os.path.join('build', 'src', 'cpp', 'SConscript'), exports="env")
SConscript(os.path.join('build', 'src', 'py', 'SConscript'), exports="env")
SConscript(os.path.join('build', 'test', 'SConscript'), exports="env")
SConscript(os.path.join('conda', 'SConscript'), exports="env")

Default("install")
90 changes: 45 additions & 45 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
platform:
- x86
- x64

environment:
matrix:
- RECIPE: libstatiskit_stl
- RECIPE: python-statiskit_stl

install:
- git clone https://github.com/StatisKit/appveyor-ci.git appveyor-ci
- cd appveyor-ci
- call install.bat

before_build:
- call before_build.bat

build_script:
- call build_script.bat

after_build:
- call after_build.bat

deploy:
provider: Script
on:
branch: master

before_deploy:
- call before_deploy.bat

deploy_script:
- call deploy_script.bat

after_deploy:
- call after_deploy.bat

on_success:
- call on_success.bat

on_failure:
- call on_failure.bat

on_finish:
- call on_finish.bat
platform:
- x86
- x64

environment:
matrix:
- RECIPE: libstatiskit_stl
- RECIPE: python-statiskit_stl

install:
- git clone https://github.com/StatisKit/appveyor-ci.git appveyor-ci
- cd appveyor-ci
- call install.bat

before_build:
- call before_build.bat

build_script:
- call build_script.bat

after_build:
- call after_build.bat

deploy:
provider: Script
on:
branch: master

before_deploy:
- call before_deploy.bat

deploy_script:
- call deploy_script.bat

after_deploy:
- call after_deploy.bat

on_success:
- call on_success.bat

on_failure:
- call on_failure.bat

on_finish:
- call on_finish.bat
62 changes: 31 additions & 31 deletions conda/SConscript
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
# -*-python-*-

from SCons.Errors import EnvironmentError

try:
Import("env")

conda_env = env.Clone(tools = ['conda'])

sources = conda_env.Glob('*')

exclude = """
""".split()

sources = [source for source in sources if not source.name in exclude]

targets = conda_env.CondaPackages(sources)
Alias("conda-build", targets)

exclude = """
""".split()

sources = [source for source in sources if not source.name in exclude]

targets = conda_env.CondaEnvironment(sources)
Alias("conda-install", targets)
except EnvironmentError:
Alias("conda-build", [])
Alias("conda-install", [])
pass
except Exception:
# -*-python-*-

from SCons.Errors import EnvironmentError

try:
Import("env")

conda_env = env.Clone(tools = ['conda'])

sources = conda_env.Glob('*')

exclude = """
""".split()

sources = [source for source in sources if not source.name in exclude]

targets = conda_env.CondaPackages(sources)
Alias("conda-build", targets)

exclude = """
""".split()

sources = [source for source in sources if not source.name in exclude]

targets = conda_env.CondaEnvironment(sources)
Alias("conda-install", targets)
except EnvironmentError:
Alias("conda-build", [])
Alias("conda-install", [])
pass
except Exception:
raise
36 changes: 18 additions & 18 deletions conda/libstatiskit_stl/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
package:
name: libstatiskit_stl
version: "1.0.0"

source:
path: ../..

build:
number: 0

about:
home: http://statiskit-stl.readthedocs.org
license: CeCILL

requirements:
build:
- libdev
run:
package:
name: libstatiskit_stl
version: "1.0.0"

source:
path: ../..

build:
number: 0

about:
home: http://statiskit-stl.readthedocs.org
license: CeCILL

requirements:
build:
- libdev
run:
- librun
2 changes: 1 addition & 1 deletion conda/python-statiskit_stl/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ set -ve

scons py --prefix=$PREFIX -j$CPU_COUNT

set +ve
set +ve
76 changes: 38 additions & 38 deletions conda/python-statiskit_stl/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
package:
name: python-statiskit_stl
version: "3.3.1"

source:
path: ../..

build:
number: 0

about:
home: http://statiskit-stl.readthedocs.org
license: CeCILL

requirements:
build:
- libdev
- python-dev
- libboost
- libstatiskit_stl
- python
run:
- librun
- libstatiskit_stl
- libboost
- python

test:
requires:
- python-dev
imports:
- statiskit.stl
source_files:
- test/test_*.py
commands:
- nosetests test -x -s -v -A "level <= {{ environ.get('TEST_LEVEL', 3) }} and linux" [linux]
- nosetests test -x -s -v -A "level <= {{ environ.get('TEST_LEVEL', 3) }} and osx" [osx]
- nosetests test -x -s -v -A "level <= {{ environ.get('TEST_LEVEL', 3) }} and win" [win]
package:
name: python-statiskit_stl
version: "3.3.1"

source:
path: ../..

build:
number: 0

about:
home: http://statiskit-stl.readthedocs.org
license: CeCILL

requirements:
build:
- libdev
- python-dev
- libboost
- libstatiskit_stl
- python
run:
- librun
- libstatiskit_stl
- libboost
- python

test:
requires:
- python-dev
imports:
- statiskit.stl
source_files:
- test/test_*.py
commands:
- nosetests test -x -s -v -A "level <= {{ environ.get('TEST_LEVEL', 3) }} and linux" [linux]
- nosetests test -x -s -v -A "level <= {{ environ.get('TEST_LEVEL', 3) }} and osx" [osx]
- nosetests test -x -s -v -A "level <= {{ environ.get('TEST_LEVEL', 3) }} and win" [win]
4 changes: 2 additions & 2 deletions readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
conda:
file: doc/environment.yml
conda:
file: doc/environment.yml

0 comments on commit 70cd7a0

Please sign in to comment.