Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,18 @@ repos:
hooks:
- id: build-docs
language_version: python3

- repo: https://github.com/windpioneers/pre-commit-hooks
rev: 0.0.5
hooks:
- id: check-branch-name
args:
- '^master$'
- '^dev$'
- '^devops/([a-z][a-z0-9]*)(-[a-z0-9]+)*$'
- '^doc/([a-z][a-z0-9]*)(-[a-z0-9]+)*$'
- '^feature/([a-z][a-z0-9]*)(-[a-z0-9]+)*$'
- '^fix/([a-z][a-z0-9]*)(-[a-z0-9]+)*$'
- '^hotfix/([a-z][a-z0-9]*)(-[a-z0-9]+)*$'
- '^review/([a-z][a-z0-9]*)(-[a-z0-9]+)*$'
- '^release/(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:-(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$'
2 changes: 0 additions & 2 deletions conanfile.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
[requires]
eigen/3.3.7
nlohmann_json/3.8.0
cpr/1.5.0
boost/1.73.0
glog/0.4.0
gtest/1.10.0
tbb/2020.1

[generators]
cmake
2 changes: 1 addition & 1 deletion docs/source/about.rst
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ importable there, since it's compliant with their schema.

I'm not a marketing person for plotly, so how to do that is out of scope here (check their docs)!!

I have a branch that has some code using the Plotly API,
I have some code using the Plotly API (`see online.h <https://github.com/thclark/cpplot/blob/458d26f99aa4298e7260bb5da65ba7915f098f5f/source/online.h#L160>`__ ),
which might be the very early beginning of a client SDK for C++,
enabling direct manipulation of online data. However, I have very little
appetite for this (I personally don't use plotly online, because I've
Expand Down
2 changes: 1 addition & 1 deletion docs/source/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ all the tricky dependencies.
.. code:: bash

git clone https://github.com/thclark/cpplot
cd cpplot && cmake . -B build
cd cpplot && mkdir -p build && cmake . -B build

This process will die first time around, and you'll get a message like:

Expand Down
20 changes: 20 additions & 0 deletions docs/source/version_history.rst
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,23 @@ Bug Fixes & Minor Changes
-------------------------
#. Fix for building against glog on windows
#. Corrected build instructions in documentation


0.0.4
=====

Removed unused cpr dependency from build system

New Features
------------
#. n/a

Backward Incompatible API Changes
---------------------------------
#. n/a

Bug Fixes & Minor Changes
-------------------------
#. Removed unused cpr dependency from build system
#. Updated docs to reflect the removed dep and to close #17
#. Added a branch naming rule to the git pre-commit