diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9a68f71..239ebc5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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/(?P0|[1-9]\d*)\.(?P0|[1-9]\d*)\.(?P0|[1-9]\d*)(?:-(?P(?: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[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$' diff --git a/conanfile.txt b/conanfile.txt index 7268cb7..8b98a07 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -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 diff --git a/docs/source/about.rst b/docs/source/about.rst index 9e4dc1a..6610799 100644 --- a/docs/source/about.rst +++ b/docs/source/about.rst @@ -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 `__ ), 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 diff --git a/docs/source/installation.rst b/docs/source/installation.rst index 5d453b3..bc14389 100644 --- a/docs/source/installation.rst +++ b/docs/source/installation.rst @@ -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: diff --git a/docs/source/version_history.rst b/docs/source/version_history.rst index 0545a9d..bd4edd1 100644 --- a/docs/source/version_history.rst +++ b/docs/source/version_history.rst @@ -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