From 16d8c561f6c2c513917e4f6a6c42f974f7119986 Mon Sep 17 00:00:00 2001 From: Ben Haller Date: Wed, 15 Dec 2021 15:10:00 -0500 Subject: [PATCH] version increment to 3.7 --- EidosScribe/Info.plist | 2 +- QtSLiM/QtSLiM.pro | 2 +- SLiMgui/Info.plist | 2 +- VERSIONS | 4 +++- core/slim_globals.h | 4 ++-- eidos/eidos_globals.h | 4 ++-- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/EidosScribe/Info.plist b/EidosScribe/Info.plist index ac1e19fdc..5aa6f0212 100644 --- a/EidosScribe/Info.plist +++ b/EidosScribe/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.6 + 2.7 CFBundleSignature ???? CFBundleVersion diff --git a/QtSLiM/QtSLiM.pro b/QtSLiM/QtSLiM.pro index b4cb397e2..4fa7596ad 100644 --- a/QtSLiM/QtSLiM.pro +++ b/QtSLiM/QtSLiM.pro @@ -18,7 +18,7 @@ QMAKE_INFO_PLIST = QtSLiM_Info.plist ICON = QtSLiM_AppIcon.icns QMAKE_TARGET_BUNDLE_PREFIX = "org.messerlab" QMAKE_BUNDLE = "SLiMgui" # This governs the location of our prefs, which we keep under org.messerlab.SLiMgui -VERSION = 3.6 +VERSION = 3.7 docIconFiles.files = $$PWD/QtSLiM_DocIcon.icns docIconFiles.path = Contents/Resources diff --git a/SLiMgui/Info.plist b/SLiMgui/Info.plist index 30a8a221d..30814661d 100644 --- a/SLiMgui/Info.plist +++ b/SLiMgui/Info.plist @@ -88,7 +88,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.6 + 3.7 CFBundleSignature ???? CFBundleVersion diff --git a/VERSIONS b/VERSIONS index 687f75bce..ef5157050 100644 --- a/VERSIONS +++ b/VERSIONS @@ -8,6 +8,9 @@ The build numbers given here are visible in SLiMgui's about panel. They are not development head: + + +version 3.7 (Eidos version 2.7) change to allow .trees files to contain unreferenced empty subpops, to allow ancestral use of subpops that are now empty (see #168) disallow reuse of subpopulation ids if they have gone into the tree-sequence tables, to prevent collisions change so that entries for unused subpops are not modified in population tables loaded from a tree sequence (PR #172) @@ -90,7 +93,6 @@ development head: updated to tskit 0.99.15 to try out C API 1.0 prerelease stuff add [Ns$ timeUnit=NULL] parameter to initializeTreeSeq() to set the name of the tree-sequence recording time unit - version 3.6 (build 2784; Eidos version 2.6): update to JSON for Modern C++ version 3.9.1 add metadata= parameter to treeSeqOutput(), to support user-generated metadata on the tree sequence diff --git a/core/slim_globals.h b/core/slim_globals.h index 1914b2918..15c12f7b3 100644 --- a/core/slim_globals.h +++ b/core/slim_globals.h @@ -41,8 +41,8 @@ class Subpopulation; class SLiMEidosBlock; -#define SLIM_VERSION_STRING ("3.6") -#define SLIM_VERSION_FLOAT (3.6) +#define SLIM_VERSION_STRING ("3.7") +#define SLIM_VERSION_FLOAT (3.7) // This should be called once at startup to give SLiM an opportunity to initialize static state diff --git a/eidos/eidos_globals.h b/eidos/eidos_globals.h index 68de4cb6d..8ab42b028 100644 --- a/eidos/eidos_globals.h +++ b/eidos/eidos_globals.h @@ -53,8 +53,8 @@ class EidosScript; class EidosToken; -#define EIDOS_VERSION_STRING ("2.6") -#define EIDOS_VERSION_FLOAT (2.6) +#define EIDOS_VERSION_STRING ("2.7") +#define EIDOS_VERSION_FLOAT (2.7) // These should be called once at startup to give Eidos an opportunity to initialize static state