Skip to content

Commit 446ac46

Browse files
authored
Merge pull request #31 from man-group/ver-0.2.0
Release 0.2.0
2 parents fa599e1 + 1b37692 commit 446ac46

File tree

6 files changed

+34
-10
lines changed

6 files changed

+34
-10
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ jobs:
164164
PYTHON_VERSION: "3_6"
165165
CIRCLE_ARTIFACTS: /tmp/circleci-artifacts/3_6
166166
CIRCLE_TEST_REPORTS: /tmp/circleci-test-results/3_6
167-
VERSION: 0.1.0
167+
VERSION: 0.2.0
168168
PANDOC_RELEASES_URL: https://github.com/jgm/pandoc/releases
169169
YARN_STATIC_DIR: notebooker/web/static/
170170
IMAGE_NAME: mangroup/notebooker
@@ -176,7 +176,7 @@ jobs:
176176
environment:
177177
CIRCLE_ARTIFACTS: /tmp/circleci-artifacts/3_7
178178
CIRCLE_TEST_REPORTS: /tmp/circleci-test-results/3_7
179-
VERSION: 0.1.0
179+
VERSION: 0.2.0
180180
PANDOC_RELEASES_URL: https://github.com/jgm/pandoc/releases
181181
YARN_STATIC_DIR: notebooker/web/static/
182182
IMAGE_NAME: mangroup/notebooker
@@ -195,7 +195,7 @@ jobs:
195195
command: |
196196
ls -la /tmp/circleci-artifacts/3_6
197197
VERSION=$(cat /tmp/circleci-artifacts/3_6/version.txt)
198-
ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${VERSION} /tmp/circleci-artifacts/3_6/dist
198+
ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} ${VERSION} /tmp/circleci-artifacts/3_6/dist
199199
workflows:
200200
version: 2
201201
build_all:

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
0.2.1 (????-??-??)
2+
------------------
3+
No changes (yet!)
4+
5+
6+
0.2.0 (2020-12-17)
7+
------------------
8+
* 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.
9+
* Performance improvement for queries
10+
11+
112
0.1.0 (2020-11-30)
213
------------------
314
Support for database plugins and tidying up configuration to be consistent across the board.

CONTRIBUTING.md

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,23 @@ in pypi, you can set up using `python setup.py develop`.
55

66

77
# Contributing
8-
In pull requests please cite the issue reference and update the changelog. Please make sure that you have
8+
In pull requests please:
9+
* cite the issue reference
10+
* update the changelog (create a new version if there is no release candidate)
11+
12+
Please make sure that you have
913
run [Black](https://black.readthedocs.io/en/stable/), [mypy](http://mypy-lang.org/),
10-
and [flake8](https://flake8.pycqa.org/en/latest/) before you submit your changes. Do also make sure to run the
11-
webapp and make sure you haven't broken anything.
14+
and [flake8](https://flake8.pycqa.org/en/latest/) before you submit your changes.
15+
The build will fail for flake8 and Black changes.
16+
PRs without a test will almost certainly be rejected.
17+
Do also make sure to run the webapp and make sure you haven't broken anything.
18+
19+
# Releasing a new version
20+
When releasing a new version, please increment the version number in:
21+
* `notebooker/_version.py`
22+
* `.circleci/config.yml`
23+
* `docs/config.yml`
24+
* `notebooker/web/static/package.json`
1225

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

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
author = "Man Group Quant Tech"
2424

2525
# The full version, including alpha/beta/rc tags
26-
release = "0.1.0"
26+
release = "0.2.0"
2727

2828

2929
# -- General configuration ---------------------------------------------------

notebooker/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "0.1.0"
1+
__version__ = "0.2.0"

notebooker/web/static/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "notebooker",
3-
"version": "0.1.0",
3+
"version": "0.2.0",
44
"description": "Notebooker - Turn notebooks into reports",
55
"dependencies": {
66
"bootstrap-table": "1.15.3",

0 commit comments

Comments
 (0)