diff --git a/.gitlab/merge_request_templates/General.md b/.gitlab/merge_request_templates/General.md new file mode 100644 index 0000000000000000000000000000000000000000..b3934b37072ff377f46028ca8a93cebe3771b6fd --- /dev/null +++ b/.gitlab/merge_request_templates/General.md @@ -0,0 +1,29 @@ +Insert a meaningful description for this merge request here. What is the +new/changed behavior? Which bug was fixed? + +--- + +Add the text above this line to the git comment. + +# Check list for the author # + +- [ ] All tests pass. (style, unit/integration, static code analysis) +- [ ] What is the main focus for the reviewer? What is the core intent of this + MR? +- [ ] How to set up a test environment. +- [ ] Annotations in code (Gitlab comments) + - Intent of new code + - Problems with old code + - Why this implementation? + +# Check list for the reviewer # + +- [ ] Tests pass +- [ ] Do I understand the intent of this MR? +- [ ] Does the test environment setup work? +- [ ] Is the intended behavior reproducible in the test environment? +- [ ] Code overview: Which functions/classes are relevant for understanding the MR? +- [ ] Work through the open comment threads. +- [ ] Are the doc strings / comments up-to-date? Or have there been behavioral + changes without amending the documentation? +- [ ] Are there spezifications? Are they satisfied? diff --git a/CHANGELOG.md b/CHANGELOG.md index 007370aa4c5c83f3127c81fed9705aa1db262635..76ca2594102b4a455712eef30b0190aa3f45e7e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed ### +- Replaced deprecated Logger.warn() method. + ### Security ### ## [0.3.0] - 2020-04-24## diff --git a/setup.py b/setup.py index cfdf462ce4217dc6180c0b7af60a87f20e2003c7..8893a126a7a02d7646625af7fc82787238344173 100755 --- a/setup.py +++ b/setup.py @@ -47,9 +47,9 @@ from setuptools import find_packages, setup MAJOR = 0 MINOR = 3 -MICRO = 1 +MICRO = 2 PRE = "" # e.g. rc0, alpha.1, 0.beta-23 -ISRELEASED = True +ISRELEASED = False if PRE: VERSION = "{}.{}.{}-{}".format(MAJOR, MINOR, MICRO, PRE) diff --git a/src/caosdb/connection/connection.py b/src/caosdb/connection/connection.py index 94ee3d0817d448285d5f828ecb8d0ac27079024a..d21f8b0c65ca8be5a9ccb687542ee838a50b2d79 100644 --- a/src/caosdb/connection/connection.py +++ b/src/caosdb/connection/connection.py @@ -178,10 +178,10 @@ class _DefaultCaosDBServerConnection(CaosDBServerConnection): context.verify_mode = ssl.CERT_REQUIRED if config.get("ssl_insecure"): - _LOGGER.warn("*** Warning! ***\n" - "Insecure SSL mode, certificate will not be checked! " - "Please consider removing the `ssl_insecure` configuration option.\n" - "****************") + _LOGGER.warning("*** Warning! ***\n" + "Insecure SSL mode, certificate will not be checked! " + "Please consider removing the `ssl_insecure` configuration option.\n" + "****************") context.verify_mode = ssl.CERT_NONE if (not context.verify_mode == ssl.CERT_NONE and