Skip to content

Commit

Permalink
Merge branch 'release/0.5.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
howardjp committed Aug 8, 2022
2 parents 8d9b217 + 237be8b commit 0f8ee56
Show file tree
Hide file tree
Showing 55 changed files with 2,010 additions and 1,273 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,8 @@ build/*
*.user

# VSCode files
.vscode
.vscode

# IDEA files
.idea
cmake-build-*
159 changes: 0 additions & 159 deletions .gitlab-ci.yml

This file was deleted.

89 changes: 0 additions & 89 deletions .travis.yml

This file was deleted.

7 changes: 4 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
cmake_minimum_required(VERSION 3.13) # GENERATOR_IS_MULTI_CONFIG

set(KAMI_VERSION_MAJOR 0)
set(KAMI_VERSION_MINOR 4)
set(KAMI_VERSION_PATCH 2)
set(KAMI_VERSION_MINOR 5)
set(KAMI_VERSION_PATCH 0)
set(KAMI_VERSION_STRING ${KAMI_VERSION_MAJOR}.${KAMI_VERSION_MINOR}.${KAMI_VERSION_PATCH})

################################################################################
Expand Down Expand Up @@ -75,7 +75,6 @@ endif()

include(cmake/functions.cmake)
include(cmake/warnings.cmake)
include(cmake/cppcheck.cmake)

################################################################################
# Sub libraries.
Expand Down Expand Up @@ -194,3 +193,5 @@ install(
)

add_subdirectory(docs)

set(ignoreMe "${CMAKE_C_COMPILER}")
2 changes: 1 addition & 1 deletion COPYRIGHT
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2020 The Johns Hopkins University Applied Physics
Copyright (c) 2020-2022 The Johns Hopkins University Applied Physics
Laboratory LLC

Permission is hereby granted, free of charge, to any person
Expand Down
11 changes: 7 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[![Build (main)](https://github.com/JHUAPL/kami/actions/workflows/build-main.yml/badge.svg)](https://github.com/JHUAPL/kami/actions/workflows/build-main.yml)
[![Build (develop)](https://github.com/JHUAPL/kami/actions/workflows/build-develop.yml/badge.svg)](https://github.com/JHUAPL/kami/actions/workflows/build-develop.yml)
[![Documentation status](https://readthedocs.org/projects/kami/badge/?version=latest)](https://kami.readthedocs.io/en/latest/?badge=latest)
[![Release status](https://img.shields.io/github/release/JHUAPL/kami.svg)](https://kami.readthedocs.io/en/latest/?badge=latest)
[![Release status](https://img.shields.io/github/release/JHUAPL/kami.svg)](https://github.com/JHUAPL/kami/releases)
![License](https://img.shields.io/github/license/JHUAPL/kami)

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

* [CLI11](https://github.com/CLIUtils/CLI11)
* [Google Test](https://github.com/google/googletest)
* [neargye-semver](https://github.com/Neargye/semver)
* [spdlog](https://github.com/gabime/spdlog)

CLI11 and spdlog are both used extensively in the examples and unit
tests. Neither is used directly by the Kami library.
CLI11 and spdlog are both used extensively in the examples.
Neither is used directly by the Kami library.

## Contribution guidelines

* Use [GitFlow](http://nvie.com/posts/a-successful-git-branching-model/)

* Use [Google Test](https://github.com/google/googletest)

## For more information

* James P. Howard, II <<[email protected]>>
13 changes: 0 additions & 13 deletions cmake/cppcheck.cmake

This file was deleted.

8 changes: 5 additions & 3 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@

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

options = {"shared": [True, False], "fPIC": [True, False]}
default_options = {"shared": True, "fPIC": True}
default_options = {"shared": False, "fPIC": False}


def _configure_cmake(self):
Expand Down Expand Up @@ -47,3 +47,5 @@ def requirements(self):
self.requires("fmt/7.1.3")
self.requires("spdlog/1.8.5")
self.requires("cli11/1.9.1")
self.requires("neargye-semver/0.3.0")
self.requires("gtest/cci.20210126")
9 changes: 9 additions & 0 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
Changelog
=========

- :feature:`0` Added a barebones "starter" model to build from
- :support:`0` Numerous documentation cleanups
- :bug:`0` Numerous code cleanups to remove void returns and eliminate stored Model references
- :feature:`0` Restructured the entire interface
- :bug:`0` Numerous build process cleanups
- :feature:`0` Added support semver versioning via neargye-semver
- :bug:`0` Make library static by default
- :bug:`0` Corrected the badge link in the README file

- :release:`0.4.2 <2021.09.25>`
- :bug:`0` Fixed Changelog to move docs to support
- :bug:`0` Fixed Changelog with current releases added
Expand Down
Loading

0 comments on commit 0f8ee56

Please sign in to comment.