Skip to content

Commit 503b8b2

Browse files
committed
version increment for SLiM 4.0.1
1 parent d85a229 commit 503b8b2

7 files changed

Lines changed: 14 additions & 10 deletions

File tree

EidosScribe/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>3.0</string>
20+
<string>3.0.1</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleVersion</key>

QtSLiM/QtSLiM.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ QMAKE_INFO_PLIST = QtSLiM_Info.plist
1818
ICON = QtSLiM_AppIcon.icns
1919
QMAKE_TARGET_BUNDLE_PREFIX = "org.messerlab"
2020
QMAKE_BUNDLE = "SLiMgui" # This governs the location of our prefs, which we keep under org.messerlab.SLiMgui
21-
VERSION = 4.0
21+
VERSION = 4.0.1
2222

2323
docIconFiles.files = $$PWD/QtSLiM_DocIcon.icns
2424
docIconFiles.path = Contents/Resources

SLiM.spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Name: SLiM
2-
Version: 4.0
3-
Release: 2%{?dist}
2+
Version: 4.0.1
3+
Release: 1%{?dist}
44
Summary: an evolutionary simulation framework
55

66
License: GPLv3+

SLiMgui/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
<key>CFBundlePackageType</key>
8989
<string>APPL</string>
9090
<key>CFBundleShortVersionString</key>
91-
<string>4.0</string>
91+
<string>4.0.1</string>
9292
<key>CFBundleSignature</key>
9393
<string>????</string>
9494
<key>CFBundleVersion</key>

VERSIONS

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ Note that not every commit will be logged here; that is what the Github commit h
66

77

88
development head (in the master branch):
9+
10+
11+
version 4.0.1 (Eidos version 3.0.1):
912
fix the documentation for the timeUnit parameter of initializeTreeSeq(), which had not been updated for SLiM 4's policy change that the default is now "ticks" in all cases
1013
fix a bug that would bite tree-seq models that reloaded with readFromPopulationFile(); such models could trigger an internal error, or leak memory
1114
fix LogFile bug with an absolute filesystem path on Windows
@@ -20,7 +23,6 @@ development head (in the master branch):
2023
add a meanParentAge property, to make calculating generation length simpler; unavailable in WF models (like age), 0 for parentless individuals
2124
add DataFrame asMatrix() method to convert a DataFrame into a matrix, if all columns are the same type/class
2225
modify recipe 16.12 II to use asMatrix() to read the mating and death files more elegantly
23-
2426

2527
version 4.0 (Eidos version 3.0):
2628
fix deprecated pyslim API issues in recipes 17.2, 17.4, 17.5, 17.7, 17.8, 17.10, 18.13:

core/slim_globals.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,9 @@ class Subpopulation;
4242
class SLiMEidosBlock;
4343

4444

45-
#define SLIM_VERSION_STRING ("4.0")
46-
#define SLIM_VERSION_FLOAT (4.0)
45+
// SLiM version: see also Info.plist and QtSLiM.pro
46+
#define SLIM_VERSION_STRING ("4.0.1")
47+
#define SLIM_VERSION_FLOAT (4.01)
4748

4849

4950
// This should be called once at startup to give SLiM an opportunity to initialize static state

eidos/eidos_globals.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,9 @@ class EidosScript;
5353
class EidosToken;
5454

5555

56-
#define EIDOS_VERSION_STRING ("3.0")
57-
#define EIDOS_VERSION_FLOAT (3.0)
56+
// Eidos version: See also Info.plist
57+
#define EIDOS_VERSION_STRING ("3.0.1")
58+
#define EIDOS_VERSION_FLOAT (3.01)
5859

5960

6061
// These should be called once at startup to give Eidos an opportunity to initialize static state

0 commit comments

Comments
 (0)