Skip to content

Commit 0f8ee56

Browse files
howardjphowardjp
committed
Merge branch 'release/0.5.0'
2 parents 8d9b217 + 237be8b commit 0f8ee56

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+2010
-1273
lines changed

‎.gitignore‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,8 @@ build/*
4040
*.user
4141

4242
# VSCode files
43-
.vscode
43+
.vscode
44+
45+
# IDEA files
46+
.idea
47+
cmake-build-*

‎.gitlab-ci.yml‎

Lines changed: 0 additions & 159 deletions
This file was deleted.

‎.travis.yml‎

Lines changed: 0 additions & 89 deletions
This file was deleted.

‎CMakeLists.txt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
cmake_minimum_required(VERSION 3.13) # GENERATOR_IS_MULTI_CONFIG
2929

3030
set(KAMI_VERSION_MAJOR 0)
31-
set(KAMI_VERSION_MINOR 4)
32-
set(KAMI_VERSION_PATCH 2)
31+
set(KAMI_VERSION_MINOR 5)
32+
set(KAMI_VERSION_PATCH 0)
3333
set(KAMI_VERSION_STRING ${KAMI_VERSION_MAJOR}.${KAMI_VERSION_MINOR}.${KAMI_VERSION_PATCH})
3434

3535
################################################################################
@@ -75,7 +75,6 @@ endif()
7575

7676
include(cmake/functions.cmake)
7777
include(cmake/warnings.cmake)
78-
include(cmake/cppcheck.cmake)
7978

8079
################################################################################
8180
# Sub libraries.
@@ -194,3 +193,5 @@ install(
194193
)
195194

196195
add_subdirectory(docs)
196+
197+
set(ignoreMe "${CMAKE_C_COMPILER}")

‎COPYRIGHT‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2020 The Johns Hopkins University Applied Physics
1+
Copyright (c) 2020-2022 The Johns Hopkins University Applied Physics
22
Laboratory LLC
33

44
Permission is hereby granted, free of charge, to any person

‎README.md‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[![Build (main)](https://github.com/JHUAPL/kami/actions/workflows/build-main.yml/badge.svg)](https://github.com/JHUAPL/kami/actions/workflows/build-main.yml)
22
[![Build (develop)](https://github.com/JHUAPL/kami/actions/workflows/build-develop.yml/badge.svg)](https://github.com/JHUAPL/kami/actions/workflows/build-develop.yml)
33
[![Documentation status](https://readthedocs.org/projects/kami/badge/?version=latest)](https://kami.readthedocs.io/en/latest/?badge=latest)
4-
[![Release status](https://img.shields.io/github/release/JHUAPL/kami.svg)](https://kami.readthedocs.io/en/latest/?badge=latest)
4+
[![Release status](https://img.shields.io/github/release/JHUAPL/kami.svg)](https://github.com/JHUAPL/kami/releases)
55
![License](https://img.shields.io/github/license/JHUAPL/kami)
66

77
# Kami is Agent-Based Modeling in Modern C++
@@ -40,15 +40,18 @@ conan create . kami/develop
4040
## Direct Dependencies
4141

4242
* [CLI11](https://github.com/CLIUtils/CLI11)
43+
* [Google Test](https://github.com/google/googletest)
44+
* [neargye-semver](https://github.com/Neargye/semver)
4345
* [spdlog](https://github.com/gabime/spdlog)
4446

45-
CLI11 and spdlog are both used extensively in the examples and unit
46-
tests. Neither is used directly by the Kami library.
47+
CLI11 and spdlog are both used extensively in the examples.
48+
Neither is used directly by the Kami library.
4749

4850
## Contribution guidelines
4951

5052
* Use [GitFlow](http://nvie.com/posts/a-successful-git-branching-model/)
51-
53+
* Use [Google Test](https://github.com/google/googletest)
54+
5255
## For more information
5356

5457
* James P. Howard, II <<[email protected]>>

‎cmake/cppcheck.cmake‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎conanfile.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33

44
class KamiConan(ConanFile):
55
name = "kami"
6-
version = "0.4.2"
6+
version = "0.5.0"
77
license = "MIT"
88
author = "James P. Howard, II <[email protected]>"
9-
url = "http://github.com/jhuapl/kami"
9+
url = "https://github.com/jhuapl/kami"
1010
description = "Agent-Based Modeling in Modern C++"
1111
topics = ("agent-based modeling", "simulation", "orms")
1212
settings = "os", "compiler", "build_type", "arch"
1313
generators = "cmake", "cmake_find_package"
1414
exports_sources = "*"
1515

1616
options = {"shared": [True, False], "fPIC": [True, False]}
17-
default_options = {"shared": True, "fPIC": True}
17+
default_options = {"shared": False, "fPIC": False}
1818

1919

2020
def _configure_cmake(self):
@@ -47,3 +47,5 @@ def requirements(self):
4747
self.requires("fmt/7.1.3")
4848
self.requires("spdlog/1.8.5")
4949
self.requires("cli11/1.9.1")
50+
self.requires("neargye-semver/0.3.0")
51+
self.requires("gtest/cci.20210126")

‎docs/changelog.rst‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
Changelog
22
=========
33

4+
- :feature:`0` Added a barebones "starter" model to build from
5+
- :support:`0` Numerous documentation cleanups
6+
- :bug:`0` Numerous code cleanups to remove void returns and eliminate stored Model references
7+
- :feature:`0` Restructured the entire interface
8+
- :bug:`0` Numerous build process cleanups
9+
- :feature:`0` Added support semver versioning via neargye-semver
10+
- :bug:`0` Make library static by default
11+
- :bug:`0` Corrected the badge link in the README file
12+
413
- :release:`0.4.2 <2021.09.25>`
514
- :bug:`0` Fixed Changelog to move docs to support
615
- :bug:`0` Fixed Changelog with current releases added

0 commit comments

Comments
 (0)