diff --git a/.circleci/config.yml b/.circleci/config.yml index b334f64d..2aed400e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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 @@ -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 @@ -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: diff --git a/CHANGELOG.md b/CHANGELOG.md index e7338456..e122e3ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 405d3402..85d1deac 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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`. diff --git a/docs/conf.py b/docs/conf.py index a51dcb31..eb280797 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -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 --------------------------------------------------- diff --git a/notebooker/_version.py b/notebooker/_version.py index 3dc1f76b..d3ec452c 100644 --- a/notebooker/_version.py +++ b/notebooker/_version.py @@ -1 +1 @@ -__version__ = "0.1.0" +__version__ = "0.2.0" diff --git a/notebooker/web/static/package.json b/notebooker/web/static/package.json index 442febe2..9cfd3339 100644 --- a/notebooker/web/static/package.json +++ b/notebooker/web/static/package.json @@ -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",