[simuPOP-devel] SF.net SVN: simupop:[4967] trunk

[<bpe...@us...>]

Revision: 4967
          http://sourceforge.net/p/simupop/code/4967
Author:   bpeng2000
Date:     2015-04-23 17:56:44 +0000 (Thu, 23 Apr 2015)
Log Message:
-----------
automatic checkin on Thu Apr 23 12:56:38 2015

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/development/release.py
    trunk/doc/refManual.lyx
    trunk/doc/refManual.pdf
    trunk/doc/userGuide.lyx
    trunk/doc/userGuide.pdf
    trunk/simuPOP_version.py
    trunk/src/simuPOP_doc.i

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2015-04-22 18:13:46 UTC (rev 4966)
+++ trunk/ChangeLog	2015-04-23 17:56:44 UTC (rev 4967)
@@ -4,8 +4,30 @@
   - BUG: simuPOP does not respond well to Ctrl-C under windows.
   - BUG: Textbox in Tkinter help dialog does not resize.
 
+1.  Version 1.1.5 -- Not released
 
-Version 1.1.3 -- Not released
+BUG FIX:
+* Fix a memory leak bug (caused by circular reference) that was incorrectly fixed in 1.1.2.
+
+NEW FEATURE:
+* support installation through command pip (pypi)
+* create binary distributions for conda.
+* Add parameter allowSelfing to CombinedParentsChooser
+* Add HermaphroditicMating
+* Allow the use of parameter infoFields to specify which information fields to output for operator Dumper and function dump.
+* Add parameter reverse=false to function Population.sortIndividuals() to allow sorting individuals in reverse order.
+
+Version 1.1.4 -- Rev 4951 (Oct, 15, 2014)
+
+NEW FEATURES:
+* Expose type defdict so that users can use this type directly.
+* Add event based demographic models.
+
+BUG FIXES:
+* Fix a bug with MultiStageModel when the population does not start from generation 0.
+
+
+Version 1.1.3 -- Rev 4915 (July 29, 2014)
 MAJOR NEW FEATURES:
 * Add a new mating scheme [[http://simupop.sourceforge.net/manual_svn/build/refManual_ch2_sec3.html#class-conditionalmating|ConditionalMating]] to apply different matings schemes to populations with different properties. ([[http://simupop.sourceforge.net/manual_svn/build/userGuide_ch6_sec1.html#conditional-mating-schemes|Example]]
 

Modified: trunk/development/release.py
===================================================================
--- trunk/development/release.py	2015-04-22 18:13:46 UTC (rev 4966)
+++ trunk/development/release.py	2015-04-23 17:56:44 UTC (rev 4967)
@@ -171,6 +171,7 @@
 def uploadDocuments(ver, rev):
     d = os.getcwd()
     os.chdir('doc')
+    run_command('make pdf')
     run_command('make dist_release')
     os.chdir(d)
     
@@ -373,6 +374,7 @@
     if 'build' in args.actions:
         prepareEnvironment()
         generateSWIGWrappers()
+        # documents need to be generated before simuPOP is built
         generateDocuments(ver, rev)
         buildSimuPOP()
     if 'src' in args.actions:

Modified: trunk/doc/refManual.lyx
===================================================================
--- trunk/doc/refManual.lyx	2015-04-22 18:13:46 UTC (rev 4966)
+++ trunk/doc/refManual.lyx	2015-04-23 17:56:44 UTC (rev 4967)
@@ -5,7 +5,7 @@
 \textclass manual
 \begin_preamble
 \renewcommand{\py@ptsize}{12pt}
-\setreleaseinfo{Release 1.1.4 (\mbox{Rev: 4950})}
+\setreleaseinfo{Release 1.1.5 (\mbox{Rev: 4963})}
 % file revision $Rev: 3372$
 \authoraddress{
 {\bf Department of Epidemiology, U.T. M.D. Anderson Cancer Center}\\

Modified: trunk/doc/refManual.pdf
===================================================================
(Binary files differ)

Modified: trunk/doc/userGuide.lyx
===================================================================
--- trunk/doc/userGuide.lyx	2015-04-22 18:13:46 UTC (rev 4966)
+++ trunk/doc/userGuide.lyx	2015-04-23 17:56:44 UTC (rev 4967)
@@ -6,7 +6,7 @@
 \begin_preamble
 \renewcommand{\py@ptsize}{12pt}
 
-\setreleaseinfo{Release 1.1.4 (\mbox{Rev: 4950})}
+\setreleaseinfo{Release 1.1.5 (\mbox{Rev: 4963})}
 % file revision $Rev: 3372$
 \authoraddress{
 {\bf Department of Epidemiology, U.T. M.D. Anderson Cancer Center}\\

Modified: trunk/doc/userGuide.pdf
===================================================================
(Binary files differ)

Modified: trunk/simuPOP_version.py
===================================================================
--- trunk/simuPOP_version.py	2015-04-22 18:13:46 UTC (rev 4966)
+++ trunk/simuPOP_version.py	2015-04-23 17:56:44 UTC (rev 4967)
@@ -1,2 +1,2 @@
-SIMUPOP_VER="1.1.4"
-SIMUPOP_REV="4950"
+SIMUPOP_VER="1.1.5"
+SIMUPOP_REV="4963"

Modified: trunk/src/simuPOP_doc.i
===================================================================
--- trunk/src/simuPOP_doc.i	2015-04-22 18:13:46 UTC (rev 4966)
+++ trunk/src/simuPOP_doc.i	2015-04-23 17:56:44 UTC (rev 4967)
@@ -7333,6 +7333,14 @@
 
 "; 
 
+%feature("docstring") simuPOP::pyFunc::~pyFunc "
+
+Usage:
+
+    x.~pyFunc()
+
+"; 
+
 %feature("docstring") simuPOP::pyFunc::numArgs "
 
 Description:

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.