Skip to content

Commit

Permalink
doc update for alpha.2 release (#1701)
Browse files Browse the repository at this point in the history
  • Loading branch information
phlptp authored Nov 8, 2020
1 parent e56b66b commit 378c901
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ project(HELICS VERSION 3.0.0)
# -----------------------------------------------------------------------------
set(HELICS_VERSION_BUILD "alpha.2")
# use ISO date YYYY-MM-DD
set(HELICS_DATE "2020-11-05")
set(HELICS_DATE "2020-11-08")

set(HELICS_VERSION_UNDERSCORE
"${HELICS_VERSION_MAJOR}_${HELICS_VERSION_MINOR}_${HELICS_VERSION_PATCH}"
Expand Down
6 changes: 3 additions & 3 deletions docs/ROADMAP.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

This document contains tentative plans for changes and improvements of note in upcoming versions of the HELICS library. All dates are approximate and subject to change, but this is a snapshot of the current planning thoughts. See the [projects](https://github.com/GMLC-TDC/HELICS/projects) for additional details

## \[2.7\] ~ 2020-11-15
## \[2.7\] ~ 2020-12-11

This will be the last of the 2.X series releases, there will likely be at least one patch release after this before fully moving to 3.0

- Internal text based (probably JSON) message format option for general backwards compatibility
- Function deprecations to prepare people to move to 3.0

## \[3.0\] ~ 2020-11-6 Beta, Final release Mid November
## \[3.0\] ~ 2020-11-16 Beta, Final release late November

Upgrade minimum compilers and build systems. Currently planned minimum targets are gcc 7.0, clang 5.0, MSVC 2017 15.7, XCode 10.1, and CMake 3.10. This is a setup which should be supported on Ubuntu 18.04 repositories. Minimum Boost version will also be updated though Boost is becoming less critical for the HELICS core so may not be that important. The likely minimum tested target will likely be 1.65.1 though the core might work with older versions and its use can be disabled completely. Certain features may require a newer boost version(1.70) than what would be available on Ubuntu 18.04. General target requirements will allow HELICS to build on the most recent 2 LTS versions of Ubuntu using readily available repo packages. Minimum required compilers for building on macOS and systems using ICC will include Xcode 10 and ICC 19. The minimum ZMQ version will also be bumped up to 4.2. General policy for Mac builds will be supporting Xcode compilers on versions of MacOS that receive security upgrades which is generally the last 3 versions, though 10.1+ and 11 will likely be the only 2 supported at HELICS 3.0 release, and support minor releases for at least 2 years. MSVC compilers will be supported for at least 2 years from release date, an appropriate CMake (meaning slightly newer than the compiler) will also be required for Visual Studio builds.

Expand All @@ -21,7 +21,7 @@ Upgrade minimum compilers and build systems. Currently planned minimum targets a
- Some additional renaming of CMake variables
- Renaming of some of the libraries and reorganization of the header locations

## \[3.1\] ~ 2020-11-15
## \[3.1\] ~ 2020-12-30

Mostly things that didn't quite make it into the 3.0 release and a number of bug fixes that come from transitioning to HELICS 3.0.

Expand Down
4 changes: 4 additions & 0 deletions tests/helics/system_tests/networkTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,9 @@ TEST_F(network_tests, test_external_udp_ipv4)
vFed1->finalize();
}

#endif

#ifdef ENABLE_ZMQ_CORE
TEST_F(network_tests, test_otherport)
{
const std::string brokerArgs = "--local_interface=tcp://127.0.0.1:33200";
Expand Down Expand Up @@ -166,4 +169,5 @@ TEST_F(network_tests, test_otherport_fail)
broker->disconnect();
}
}

#endif

0 comments on commit 378c901

Please sign in to comment.