Skip to content

Commit

Permalink
Fix packaging issues of C++ sources and bump version number
Browse files Browse the repository at this point in the history
  • Loading branch information
molpopgen committed Dec 16, 2018
1 parent 0ea743d commit 6b2ca09
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
recursive-include fwdpy11 *.cpp *.hpp
recursive-include fwdpy11 *.cc *.hpp
recursive-include m4 *.m4
recursive-include tests *.cpp *.pyx *.py
include COPYING
Expand Down
18 changes: 9 additions & 9 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for fwdpy11 0.2.0.
# Generated by GNU Autoconf 2.69 for fwdpy11 0.2.1.
#
# Report bugs to <[email protected]>.
#
Expand Down Expand Up @@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='fwdpy11'
PACKAGE_TARNAME='fwdpy11'
PACKAGE_VERSION='0.2.0'
PACKAGE_STRING='fwdpy11 0.2.0'
PACKAGE_VERSION='0.2.1'
PACKAGE_STRING='fwdpy11 0.2.1'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL=''

Expand Down Expand Up @@ -1256,7 +1256,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.2.0 to adapt to many kinds of systems.
\`configure' configures fwdpy11 0.2.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1318,7 +1318,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of fwdpy11 0.2.0:";;
short | recursive ) echo "Configuration of fwdpy11 0.2.1:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1408,7 +1408,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
fwdpy11 configure 0.2.0
fwdpy11 configure 0.2.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -1798,7 +1798,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.2.0, which was
It was created by fwdpy11 $as_me 0.2.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -5001,7 +5001,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.2.0, which was
This file was extended by fwdpy11 $as_me 0.2.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -5054,7 +5054,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.2.0
fwdpy11 config.status 0.2.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ dnl 2) package version (i.e. 1.2)
dnl 3) bug/info/project email address (i.e. [email protected])
dnl----
dnl
AC_INIT([fwdpy11], [0.2.0], [[email protected]])
AC_INIT([fwdpy11], [0.2.1], [[email protected]])

dnl----
dnl If you plan to use Automake, initialize it hre
Expand Down
4 changes: 2 additions & 2 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,9 @@ def setup(app):
# built documents.
#
# The short X.Y version.
version = '0.2.0'
version = '0.2.1'
# The full version, including alpha/beta/rc tags.
release = '0.2.0'
release = '0.2.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion doc/fwdpy11.doxygen
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.0
PROJECT_NUMBER = 0.2.1

# 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
Expand Down
2 changes: 1 addition & 1 deletion fwdpy11/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.2.0'
__version__ = '0.2.1'
18 changes: 9 additions & 9 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
if sys.version_info[0] < 3:
raise ValueError("Python 3 is required!")

__version__ = '0.2.0'
__version__ = '0.2.1'

if sys.version_info < (3, 3):
raise RuntimeError("Python >= 3.3 required")
Expand Down Expand Up @@ -145,16 +145,16 @@ def __str__(self):
CMakeExtension('fwdpy11._Population'),
CMakeExtension('fwdpy11._Populations'),
CMakeExtension('fwdpy11.fwdpy11_types'),
CMakeExtension('fwdpy11.genetic_value_noise',),
CMakeExtension('fwdpy11.wright_fisher_slocus',),
CMakeExtension('fwdpy11.wright_fisher_mlocus',),
CMakeExtension('fwdpy11.gsl_random',),
CMakeExtension('fwdpy11.genetic_value_noise'),
CMakeExtension('fwdpy11.wright_fisher_slocus'),
CMakeExtension('fwdpy11.wright_fisher_mlocus'),
CMakeExtension('fwdpy11.gsl_random'),
CMakeExtension('fwdpy11.multilocus'),
CMakeExtension('fwdpy11.util'),
CMakeExtension('fwdpy11.ts',),
CMakeExtension('fwdpy11.tsrecorders',),
CMakeExtension('fwdpy11.ts_from_msprime',),
CMakeExtension('fwdpy11.wright_fisher_slocus_ts',),
CMakeExtension('fwdpy11.ts'),
CMakeExtension('fwdpy11.tsrecorders'),
CMakeExtension('fwdpy11.ts_from_msprime'),
CMakeExtension('fwdpy11.wright_fisher_slocus_ts'),
]


Expand Down
16 changes: 8 additions & 8 deletions setup.py.in
Original file line number Diff line number Diff line change
Expand Up @@ -145,16 +145,16 @@ ext_modules = [
CMakeExtension('fwdpy11._Population'),
CMakeExtension('fwdpy11._Populations'),
CMakeExtension('fwdpy11.fwdpy11_types'),
CMakeExtension('fwdpy11.genetic_value_noise',),
CMakeExtension('fwdpy11.wright_fisher_slocus',),
CMakeExtension('fwdpy11.wright_fisher_mlocus',),
CMakeExtension('fwdpy11.gsl_random',),
CMakeExtension('fwdpy11.genetic_value_noise'),
CMakeExtension('fwdpy11.wright_fisher_slocus'),
CMakeExtension('fwdpy11.wright_fisher_mlocus'),
CMakeExtension('fwdpy11.gsl_random'),
CMakeExtension('fwdpy11.multilocus'),
CMakeExtension('fwdpy11.util'),
CMakeExtension('fwdpy11.ts',),
CMakeExtension('fwdpy11.tsrecorders',),
CMakeExtension('fwdpy11.ts_from_msprime',),
CMakeExtension('fwdpy11.wright_fisher_slocus_ts',),
CMakeExtension('fwdpy11.ts'),
CMakeExtension('fwdpy11.tsrecorders'),
CMakeExtension('fwdpy11.ts_from_msprime'),
CMakeExtension('fwdpy11.wright_fisher_slocus_ts'),
]


Expand Down

0 comments on commit 6b2ca09

Please sign in to comment.