Skip to content

Commit

Permalink
Merge pull request #27 from pfernique/master
Browse files Browse the repository at this point in the history
Update for Python 3
  • Loading branch information
pfernique committed Sep 13, 2017
2 parents 667fb05 + e9cdae8 commit e069cd4
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 12 deletions.
8 changes: 7 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,14 @@ platform:
environment:
matrix:
- CONDA_RECIPE: libstatiskit_stl
CONDA_VERSION: 2
- CONDA_RECIPE: libstatiskit_stl
CONDA_VERSION: 3
- CONDA_RECIPE: python-statiskit_stl

CONDA_VERSION: 2
- CONDA_RECIPE: python-statiskit_stl
CONDA_VERSION: 3

install:
- git clone https://github.com/StatisKit/appveyor-ci.git appveyor-ci
- cd appveyor-ci
Expand Down
6 changes: 3 additions & 3 deletions src/py/statiskit/stl/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from set import *
from vector import *
from generator import *
from .set import *
from .vector import *
from .generator import *
2 changes: 1 addition & 1 deletion src/py/statiskit/stl/_stl.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@


# Import Boost.Python module
import __stl
import .__stl


# Group template specializations
Expand Down
4 changes: 2 additions & 2 deletions src/py/statiskit/stl/generator.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import _stl
import __stl
import ._stl
import .__stl

from functools import wraps

Expand Down
4 changes: 2 additions & 2 deletions src/py/statiskit/stl/set.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import _stl
import __stl
import ._stl
import .__stl

from functools import wraps
import sys
Expand Down
4 changes: 2 additions & 2 deletions src/py/statiskit/stl/vector.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import _stl
import __stl
import ._stl
import .__stl

from functools import wraps
import sys
Expand Down
8 changes: 7 additions & 1 deletion travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,14 @@ services:

env:
- CONDA_RECIPE=libstatiskit_stl
CONDA_VERSION=2
- CONDA_RECIPE=libstatiskit_stl
CONDA_VERSION=3
- CONDA_RECIPE=python-statiskit_stl

CONDA_VERSION=2
- CONDA_RECIPE=python-statiskit_stl
CONDA_VERSION=3

install:
- git clone https://github.com/StatisKit/travis-ci.git travis-ci
- cd travis-ci
Expand Down

0 comments on commit e069cd4

Please sign in to comment.