About to release v0.9.3

bjodah · Apr 30, 2018 · 9d35e04 · 9d35e04
1 parent 744ea32
commit 9d35e04
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,7 @@
+v0.9.3
+======
+- Relax test of time_cpu & time_jac
+
 v0.9.2
 ======
 - Update AnyODE (12)

diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
@@ -15,6 +15,7 @@ requirements:
   build:
     - python
     - numpy
+    - setuptools
     - boost
     - cython
   run:

diff --git a/pyodeint/tests/test_odeint_numpy.py b/pyodeint/tests/test_odeint_numpy.py
@@ -104,8 +104,8 @@ def test_integrate_predefined(method, use_jac):
     yref = decay_get_Cref(k, y0, xout)
     assert np.allclose(yout, yref)
     if os.name == 'posix':
-        assert 1e-9 < info['time_wall'] < 1.0  # Takes a few ms on a 2012 desktop computer
-        assert 1e-9 < info['time_cpu'] < 1.0  # Takes a few ms on a 2012 desktop computer
+        assert info['time_wall'] >= 0
+        assert info['time_cpu'] >= 0
 
 
 def test_adaptive_return_on_error():

diff --git a/scripts/generate_docs.sh b/scripts/generate_docs.sh
@@ -12,10 +12,11 @@ NARGS=$#
 PKG=$(find . -maxdepth 2 -name __init__.py -print0 | xargs -0 -n1 dirname | xargs basename)
 AUTHOR=$(head -n 1 AUTHORS)
 python3 -m pip install --user -e .[docs]
-sphinx-apidoc --full --force -A "$AUTHOR" --module-first --doc-version=$(python setup.py --version) -F -o doc $PKG/ $(find . -type d -name tests)
+sphinx-apidoc --full --force -A "$AUTHOR" --module-first --doc-version=$(python3 setup.py --version) -F -o doc $PKG/ $(find . -type d -name tests)
 #sed -i 's/Contents/.. include:: ..\/README.rst\n\nContents/g' doc/index.rst
 #echo ".. include:: ../README.rst" >>doc/index.rst
 cat <<EOF >>doc/index.rst
+
 Overview
 ========
 $(tail -n+3 README.rst)

diff --git a/scripts/release.sh b/scripts/release.sh
@@ -22,7 +22,7 @@ PKG=$(find . -maxdepth 2 -name __init__.py -print0 | xargs -0 -n1 dirname | xarg
 ! grep --include "*.py" "will_be_missing_in='$VERSION'" -R $PKG/  # see deprecation()
 PKG_UPPER=$(echo $PKG | tr '[:lower:]' '[:upper:]')
 ./scripts/run_tests.sh
-env ${PKG_UPPER}_RELEASE_VERSION=v$VERSION python setup.py sdist
+env ${PKG_UPPER}_RELEASE_VERSION=v$VERSION python3 setup.py sdist
 env ${PKG_UPPER}_RELEASE_VERSION=v$VERSION ./scripts/generate_docs.sh $4 ${5:-$PKG} v$VERSION
 for CONDA_PY in 2.7 3.4 3.5; do
     for CONDA_NPY in 1.11; do

diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh
@@ -3,6 +3,6 @@
 #   $ ./scripts/run_tests.sh
 # or
 #   $ ./scripts/run_tests.sh --cov pycvodes --cov-report html
-${PYTHON:-python} setup.py build_ext -i
-${PYTHON:-python} -m pytest --doctest-modules --pep8 --flakes $@
-${PYTHON:-python} -m doctest README.rst
+${PYTHON:-python3} setup.py build_ext -i
+${PYTHON:-python3} -m pytest --doctest-modules --pep8 --flakes $@
+MPLBACKEND=Agg ${PYTHON:-python3} -m doctest README.rst
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,7 @@ requirements: @@
       build:
         - python
         - numpy
+        - setuptools
         - boost
         - cython
       run:
@@ Expand Down @@