From 153f7e996f913e7df3058bcd5a80c3d9a5e8120f Mon Sep 17 00:00:00 2001 From: Andrew Gaspar Date: Mon, 3 Aug 2020 17:16:08 -0600 Subject: [PATCH 1/6] Version 0.1.0 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e91f3f8af8f1..4937af3958ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ #========================================================================================= cmake_minimum_required(VERSION 3.10) -project(parthenon LANGUAGES C CXX) +project(parthenon VERSION 0.1.0 LANGUAGES C CXX) include(CTest) From 731c01091924c6e99499b4760a63fd3aaef84134 Mon Sep 17 00:00:00 2001 From: Andrew Gaspar Date: Mon, 3 Aug 2020 17:20:17 -0600 Subject: [PATCH 2/6] Prefix versions with v and create a branch for each major release --- CONTRIBUTING.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fb9d7fa59b34..2991d025348a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -28,7 +28,8 @@ We aim at creating a new release everyone 4 to 6 weeks. The decision on creating a new release is made during the bi-weekly calls. A release consists of of merging `develop` into `stable` and create a new tag for that version using a modified [semantic versioning](https://semver.org/) scheme. -Releases will be tagged `0.MAJOR.MINOR` given the current rapid development. +Releases will be tagged `v0.MAJOR.MINOR` given the current rapid development. +Release branches named `v0.MAJOR` will track the latest minor release. - MAJOR is incremented for API incompatible changes - MINOR is incremented for backwards compatible changes and bug fixes From 9affaf910caaedf7ee3cfb2406a7f69c350342d1 Mon Sep 17 00:00:00 2001 From: Andrew Gaspar Date: Tue, 4 Aug 2020 09:31:12 -0600 Subject: [PATCH 3/6] Update Changelog --- CHANGELOG.md | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e2ba5f245ca2..52a6efa3e3ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,26 +2,13 @@ ## Current develop -### Added (new features/APIs/variables/...) -- Introduced CHANGELOG.md - -### Changed (changing behavior/API/variables/...) - -### Fixed (not changing behavior/API/variables/...) - -### Removed - - -## Release 0.MAJOR.MINOR -Note: -- will only contain the subsections of develop that were filled -- will (ideally) include the PR that introduced the change - ### Added (new features/APIs/variables/...) - lorem (#11) - ipsum (#14) ### Fixed (not changing behavior/API/variables/...) - - dolor (#911) +## Release 0.1.0 + +Initial release of Parthenon AMR infrastructure. \ No newline at end of file From b94efb9d48f578792120f1ae714ecb6be282e242 Mon Sep 17 00:00:00 2001 From: Andrew Gaspar Date: Tue, 4 Aug 2020 14:06:06 -0600 Subject: [PATCH 4/6] Add date to release --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 52a6efa3e3ce..2a78d8cffc01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,5 +10,6 @@ - dolor (#911) ## Release 0.1.0 +Date: 8/4/2020 Initial release of Parthenon AMR infrastructure. \ No newline at end of file From 7b2cd22caacbb72ce7e1c6dd70f0618b6d01d03d Mon Sep 17 00:00:00 2001 From: Andrew Gaspar Date: Tue, 11 Aug 2020 09:32:26 -0600 Subject: [PATCH 5/6] Restore "Changed" and "Removed" Remove lorem ipsum text Remove release branches --- CHANGELOG.md | 7 ++++--- CONTRIBUTING.md | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a78d8cffc01..e6bb8311a2e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,11 +3,12 @@ ## Current develop ### Added (new features/APIs/variables/...) -- lorem (#11) -- ipsum (#14) + +### Changed (changing behavior/API/variables/...) ### Fixed (not changing behavior/API/variables/...) -- dolor (#911) + +### Removed ## Release 0.1.0 Date: 8/4/2020 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2991d025348a..b4691617dcad 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -29,7 +29,6 @@ The decision on creating a new release is made during the bi-weekly calls. A release consists of of merging `develop` into `stable` and create a new tag for that version using a modified [semantic versioning](https://semver.org/) scheme. Releases will be tagged `v0.MAJOR.MINOR` given the current rapid development. -Release branches named `v0.MAJOR` will track the latest minor release. - MAJOR is incremented for API incompatible changes - MINOR is incremented for backwards compatible changes and bug fixes From 9b2826a5baf5f466cef703fdffd5d5f1445a0a49 Mon Sep 17 00:00:00 2001 From: Andrew Gaspar Date: Mon, 17 Aug 2020 15:08:49 -0600 Subject: [PATCH 6/6] Update CHANGELOG.md --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6bb8311a2e5..db3818964fe5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,4 +13,7 @@ ## Release 0.1.0 Date: 8/4/2020 -Initial release of Parthenon AMR infrastructure. \ No newline at end of file +Initial release of Parthenon AMR infrastructure. + +### Changed +[[PR 214]](https://github.com/lanl/parthenon/pull/214): The weak linked routines for user-specified parthenon behavior have been removed in favor of a more portable approach. See [the documentation](docs/README.md#user-specified-internal-functions).