Skip to content

Commit

Permalink
Merge pull request #31 from man-group/ver-0.2.0
Browse files Browse the repository at this point in the history
Release 0.2.0
  • Loading branch information
jonbannister authored Dec 17, 2020
2 parents fa599e1 + 1b37692 commit 446ac46
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ jobs:
PYTHON_VERSION: "3_6"
CIRCLE_ARTIFACTS: /tmp/circleci-artifacts/3_6
CIRCLE_TEST_REPORTS: /tmp/circleci-test-results/3_6
VERSION: 0.1.0
VERSION: 0.2.0
PANDOC_RELEASES_URL: https://github.com/jgm/pandoc/releases
YARN_STATIC_DIR: notebooker/web/static/
IMAGE_NAME: mangroup/notebooker
Expand All @@ -176,7 +176,7 @@ jobs:
environment:
CIRCLE_ARTIFACTS: /tmp/circleci-artifacts/3_7
CIRCLE_TEST_REPORTS: /tmp/circleci-test-results/3_7
VERSION: 0.1.0
VERSION: 0.2.0
PANDOC_RELEASES_URL: https://github.com/jgm/pandoc/releases
YARN_STATIC_DIR: notebooker/web/static/
IMAGE_NAME: mangroup/notebooker
Expand All @@ -195,7 +195,7 @@ jobs:
command: |
ls -la /tmp/circleci-artifacts/3_6
VERSION=$(cat /tmp/circleci-artifacts/3_6/version.txt)
ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${VERSION} /tmp/circleci-artifacts/3_6/dist
ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} ${VERSION} /tmp/circleci-artifacts/3_6/dist
workflows:
version: 2
build_all:
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
0.2.1 (????-??-??)
------------------
No changes (yet!)


0.2.0 (2020-12-17)
------------------
* Code output can now be hidden from PDF and email output! Either check the box in the "Run Report" dialog or, using the cli, use the new `--hide-code` option.
* Performance improvement for queries


0.1.0 (2020-11-30)
------------------
Support for database plugins and tidying up configuration to be consistent across the board.
Expand Down
21 changes: 17 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,23 @@ in pypi, you can set up using `python setup.py develop`.


# Contributing
In pull requests please cite the issue reference and update the changelog. Please make sure that you have
In pull requests please:
* cite the issue reference
* update the changelog (create a new version if there is no release candidate)

Please make sure that you have
run [Black](https://black.readthedocs.io/en/stable/), [mypy](http://mypy-lang.org/),
and [flake8](https://flake8.pycqa.org/en/latest/) before you submit your changes. Do also make sure to run the
webapp and make sure you haven't broken anything.
and [flake8](https://flake8.pycqa.org/en/latest/) before you submit your changes.
The build will fail for flake8 and Black changes.
PRs without a test will almost certainly be rejected.
Do also make sure to run the webapp and make sure you haven't broken anything.

# Releasing a new version
When releasing a new version, please increment the version number in:
* `notebooker/_version.py`
* `.circleci/config.yml`
* `docs/config.yml`
* `notebooker/web/static/package.json`

When releasing a new version, increment the version number in `notebooker/_version.py`.
This build will validate that these numbers match those given in `.circleci/config.yml`.

2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
author = "Man Group Quant Tech"

# The full version, including alpha/beta/rc tags
release = "0.1.0"
release = "0.2.0"


# -- General configuration ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion notebooker/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.1.0"
__version__ = "0.2.0"
2 changes: 1 addition & 1 deletion notebooker/web/static/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "notebooker",
"version": "0.1.0",
"version": "0.2.0",
"description": "Notebooker - Turn notebooks into reports",
"dependencies": {
"bootstrap-table": "1.15.3",
Expand Down

0 comments on commit 446ac46

Please sign in to comment.