From fc4a2beab118c64bfa78ee4e2b86bf6cd9b86f5e Mon Sep 17 00:00:00 2001 From: molpopgen Date: Fri, 23 Feb 2018 09:12:23 -0800 Subject: [PATCH 1/3] fix dtype registration for flattened_popgenmut. #66 --- fwdpy11/src/fwdpy11_types.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fwdpy11/src/fwdpy11_types.cc b/fwdpy11/src/fwdpy11_types.cc index c68a1f731..d07798659 100644 --- a/fwdpy11/src/fwdpy11_types.cc +++ b/fwdpy11/src/fwdpy11_types.cc @@ -427,7 +427,7 @@ PYBIND11_MODULE(fwdpy11_types, m) ":class:`fwdpy11.fwdpp_types.Gamete`. " "Typically, access will be read-only."); - PYBIND11_NUMPY_DTYPE(flattened_popgenmut, pos, s, h, g, label, neutral); + PYBIND11_NUMPY_DTYPE(flattened_popgenmut, g, label, neutral, pos, s, h); PYBIND11_NUMPY_DTYPE(diploid_traits, g, e, w); PYBIND11_NUMPY_DTYPE(diploid_gametes, locus, first, second); py::bind_vector>( From 1ee75f3ab98099058eb0fc12f3b8fa343d51049a Mon Sep 17 00:00:00 2001 From: molpopgen Date: Fri, 23 Feb 2018 09:13:19 -0800 Subject: [PATCH 2/3] bump version to 0.1.3.post2 --- configure | 18 +++++++++--------- configure.ac | 2 +- doc/conf.py | 4 ++-- doc/fwdpy11.doxygen | 2 +- fwdpy11/__init__.py | 2 +- setup.py | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/configure b/configure index 0f746b015..4bb7dfb89 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for fwdpy11 0.1.3.post1. +# Generated by GNU Autoconf 2.69 for fwdpy11 0.1.3.post2. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='fwdpy11' PACKAGE_TARNAME='fwdpy11' -PACKAGE_VERSION='0.1.3.post1' -PACKAGE_STRING='fwdpy11 0.1.3.post1' +PACKAGE_VERSION='0.1.3.post2' +PACKAGE_STRING='fwdpy11 0.1.3.post2' PACKAGE_BUGREPORT='krthornt@uci.edu' PACKAGE_URL='' @@ -1245,7 +1245,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures fwdpy11 0.1.3.post1 to adapt to many kinds of systems. +\`configure' configures fwdpy11 0.1.3.post2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1306,7 +1306,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of fwdpy11 0.1.3.post1:";; + short | recursive ) echo "Configuration of fwdpy11 0.1.3.post2:";; esac cat <<\_ACEOF @@ -1396,7 +1396,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -fwdpy11 configure 0.1.3.post1 +fwdpy11 configure 0.1.3.post2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1786,7 +1786,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by fwdpy11 $as_me 0.1.3.post1, which was +It was created by fwdpy11 $as_me 0.1.3.post2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4990,7 +4990,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by fwdpy11 $as_me 0.1.3.post1, which was +This file was extended by fwdpy11 $as_me 0.1.3.post2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5043,7 +5043,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -fwdpy11 config.status 0.1.3.post1 +fwdpy11 config.status 0.1.3.post2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 937bc7576..98785c584 100644 --- a/configure.ac +++ b/configure.ac @@ -45,7 +45,7 @@ dnl 2) package version (i.e. 1.2) dnl 3) bug/info/project email address (i.e. bug-foo@gnu.org) dnl---- dnl -AC_INIT([fwdpy11], [0.1.3.post1], [krthornt@uci.edu]) +AC_INIT([fwdpy11], [0.1.3.post2], [krthornt@uci.edu]) dnl---- diff --git a/doc/conf.py b/doc/conf.py index 3dcdcbb57..d666404f2 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -90,9 +90,9 @@ def setup(app): # built documents. # # The short X.Y version. -version = '0.1.3.post1' +version = '0.1.3.post2' # The full version, including alpha/beta/rc tags. -release = '0.1.3.post1' +release = '0.1.3.post2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/fwdpy11.doxygen b/doc/fwdpy11.doxygen index 8167e6f74..d39927258 100644 --- a/doc/fwdpy11.doxygen +++ b/doc/fwdpy11.doxygen @@ -38,7 +38,7 @@ PROJECT_NAME = fwdpy11 # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 0.1.3.post1 +PROJECT_NUMBER = 0.1.3.post2 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/fwdpy11/__init__.py b/fwdpy11/__init__.py index 6a85b6670..6316d8c83 100644 --- a/fwdpy11/__init__.py +++ b/fwdpy11/__init__.py @@ -22,7 +22,7 @@ if sys.version_info[0] < 3: raise ValueError("Python3 required!") -__version__ = '0.1.3.post1' +__version__ = '0.1.3.post2' from .fwdpp_types import * from .fwdpy11_types import * from .regions import * diff --git a/setup.py b/setup.py index cfbb7db18..1017540fd 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ if sys.version_info[0] < 3: raise ValueError("Python 3 is required!") -__version__ = '0.1.3.post1' +__version__ = '0.1.3.post2' if sys.version_info < (3, 3): raise RuntimeError("Python >= 3.3 required") From 64468ae416f56127229e94585a4e7b0bdba7ed17 Mon Sep 17 00:00:00 2001 From: molpopgen Date: Fri, 23 Feb 2018 09:24:32 -0800 Subject: [PATCH 3/3] change Python to 3.6 for Travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b59567821..6012c0ea5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,7 @@ install: - if [ "$TRAVIS_OS_NAME" == "linux" ]; then conda install gcc; fi - if [ "$TRAVIS_OS_NAME" == "osx" -a "$OSXGCC" == "1" ]; then conda install gcc; fi - conda install -c r gsl - - conda install cython numpy python==3.5 + - conda install cython numpy python==3.6 - conda install -c conda-forge pybind11==2.2.0 - pip install cppimport script: