From bfb8f0f51c00981bbcd7bf88b0ef29be6be5302d Mon Sep 17 00:00:00 2001 From: Jack DeVries Date: Thu, 18 Mar 2021 00:00:00 +0000 Subject: [PATCH] chore: bump version to 2.1.2 --- CHANGELOG.md | 16 +++++++-- VERSION | 1 + django_smg/frontend/package.json | 4 +-- .../frontend/templates/frontend/index.html | 2 +- django_smg/frontend/webpack.config.js | 2 +- version_bump.py | 34 +++++++++++++++++++ 6 files changed, 53 insertions(+), 6 deletions(-) create mode 100644 VERSION create mode 100644 version_bump.py diff --git a/CHANGELOG.md b/CHANGELOG.md index 9872b31b..0ab7c58b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,27 @@ +# 2.1.2 + +- Configure email in production for real password reset functionality (#27) +- Configured and began writing frontend unit tests with jest and React Testing + Library. +- Improvements for contributors + - Single boolean switch to go from dbsqlite to mysql in + `development_settings.py` + - Continue to maintain `dev_setup.sh`, which is not more descriptive and runs + new frontend test suite on setup. +- Misc but fixes (#13, #20) + # 2.1.1 - Fix spreadsheet parsing bugs on the backend, mostly related to handling names with extra whitespace. - Issue #21: Better error messages for invalid spreadsheets. The site will now provide a detailed "traceback" identifying each error and which row the - error occured on. + error occurred on. - missing name or link values - invalid links - Validate group name length to enforce 15 character limit. Update CSS to make group names always display nicely. -- Scripts for develoment and dev ops +- Scripts for development and dev ops - Automated database backup - Automated construction and destruction of mysql database through Docker for easy testing diff --git a/VERSION b/VERSION new file mode 100644 index 00000000..8f9174b4 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +2.1.2 \ No newline at end of file diff --git a/django_smg/frontend/package.json b/django_smg/frontend/package.json index 9c280548..cac9e53e 100644 --- a/django_smg/frontend/package.json +++ b/django_smg/frontend/package.json @@ -1,7 +1,7 @@ { "name": "frontend", - "version": "1.0.0", - "description": "", + "version": "2.1.2", + "description": "songmakergallery.com's frontend application.", "main": "index.js", "scripts": { "dev": "webpack --mode development --watch", diff --git a/django_smg/frontend/templates/frontend/index.html b/django_smg/frontend/templates/frontend/index.html index 7414f7ff..2a6a7845 100644 --- a/django_smg/frontend/templates/frontend/index.html +++ b/django_smg/frontend/templates/frontend/index.html @@ -22,6 +22,6 @@
- + diff --git a/django_smg/frontend/webpack.config.js b/django_smg/frontend/webpack.config.js index 01b7026c..d05d4e09 100644 --- a/django_smg/frontend/webpack.config.js +++ b/django_smg/frontend/webpack.config.js @@ -36,7 +36,7 @@ module.exports = { }, entry: "./src/index.jsx", output: { - filename: "main_v2.1.1.js", + filename: "main_v2.1.2.js", path: path.resolve(__dirname, "static", "frontend", "webpack_output"), }, }; diff --git a/version_bump.py b/version_bump.py new file mode 100644 index 00000000..6139efcd --- /dev/null +++ b/version_bump.py @@ -0,0 +1,34 @@ +import re + +new = input('Enter new version number: ') + +def change(path, regex, replacement): + with open(path, 'r') as fl: + data = fl.read() + with open(path, 'w') as fl: + fl.write(re.sub(regex, replacement, data)) + +# update VERSION tracker file at root +with open( 'VERSION', 'w') as fl: + fl.write(new) + +# update index.html template +change( + 'django_smg/frontend/templates/frontend/index.html', + r'webpack_output/main_v(.*)\.js', + f'webpack_output/main_v{new}.js', +) + +# update package.json +change( + 'django_smg/frontend/package.json', + r'"version": "(.*)",', + f'"version": "{new}",' +) + +# update webpack config +change( + 'django_smg/frontend/webpack.config.js', + r'filename: "main_v(.*).js",', + f'filename: "main_v{new}.js",', +)