Skip to content

Commit 85d423d

Browse files
authored
Merge pull request #44 from stephenhky/circleci
Using pytest instead of the old way of running unit tests
2 parents 2a261e5 + 363e33c commit 85d423d

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

.circleci/config.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,14 @@ shared: &shared
1818
command: |
1919
pip install --upgrade --user pip
2020
pip install --upgrade --user .
21+
python setup.py build_ext --inplace
2122
2223
- run:
2324
name: Run Unit Tests
2425
command: |
25-
python setup.py test
26+
pip install -U pytest
27+
pip install -U pytest-cython
28+
pytest --doctest-cython
2629
2730
2831

setup.py

+11-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11

2-
from setuptools import setup
2+
from setuptools import setup, Extension
33
import numpy as np
44

5-
from Cython.Build import cythonize
6-
ext_modules = cythonize(['finsim/portfolio/optimize/native/cythonmetrics.pyx',
7-
'finsim/estimate/native/cythonfit.pyx',
8-
'finsim/estimate/native/cythonrisk.pyx'])
5+
# from Cython.Build import cythonize
6+
# ext_modules = cythonize(['finsim/portfolio/optimize/native/cythonmetrics.pyx',
7+
# 'finsim/estimate/native/cythonfit.pyx',
8+
# 'finsim/estimate/native/cythonrisk.pyx'])
9+
ext_modules = [
10+
Extension('finsim.portfolio.optimize.native.cythonmetrics', ['finsim/portfolio/optimize/native/cythonmetrics.c']),
11+
Extension('finsim.estimate.native.cythonfit', [ 'finsim/estimate/native/cythonfit.c']),
12+
Extension('finsim.estimate.native.cythonrisk', ['finsim/estimate/native/cythonrisk.c'])
13+
]
914

1015

1116
def readme():
@@ -25,7 +30,7 @@ def package_description():
2530

2631
setup(
2732
name='finsim',
28-
version="0.11.0",
33+
version="0.11.1",
2934
description="Financial simulation and inference",
3035
long_description=package_description(),
3136
long_description_content_type='text/markdown',

0 commit comments

Comments
 (0)