Merge branch 'master' into production

.flake8

@@ -1,18 +1,32 @@
 [flake8]
 extend-ignore =
-    E124,   ; closing bracket does not match visual indentation
-    E127,   ; continuation line over-indented for visual indent
-    E128,   ; continuation line under-indented for visual indent
-    E221,   ; multiple spaces before operator
-    E225,   ; missing whitespace around operator
-    E231,   ; missing whitespace after ',' and ':'
-    E252,   ; missing whitespace around parameter equal
-    E261,   ; at least two spaces before inline comment
-    E265,   ; block comment should start with '# '
-    E272,   ; multiple spaces before keyword
-    E303,   ; too many blank lines
-    E501,   ; line too long
-    W291,   ; trailing whitespace
-    W605,   ; invalid escape sequence
+    E124,
+       ; closing bracket does not match visual indentation
+    E127,
+       ; continuation line over-indented for visual indent
+    E128,
+       ; continuation line under-indented for visual indent
+    E221,
+       ; multiple spaces before operator
+    E225,
+       ; missing whitespace around operator
+    E231,
+       ; missing whitespace after ',' and ':'
+    E252,
+       ; missing whitespace around parameter equal
+    E261,
+       ; at least two spaces before inline comment
+    E265,
+       ; block comment should start with '# '
+    E272,
+       ; multiple spaces before keyword
+    E303,
+       ; too many blank lines
+    E501,
+       ; line too long
+    W291,
+       ; trailing whitespace
+    W605,
+       ; invalid escape sequence
 
 per-file-ignores = __init__.py:F401

.github/workflows/production.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches: [ production, "v[0-9]+.[0-9]+.post" ]
   release:
-    types: [ published ]
+    types: [ published , edited ]
 
 jobs:
   build-n-publish-to-pypi:
@@ -47,7 +47,7 @@ jobs:
           .
 
       - name: Publish production distribution to PyPI
-        if: startsWith(github.ref, 'refs/tags')
+        if: startsWith(github.ref, 'refs/tags') && ! github.event.release.prerelease
         uses: pypa/gh-action-pypi-publish@v1.4.2
         with:
           password: ${{ secrets.PYPI_API_TOKEN }}

.gitignore

@@ -18,6 +18,9 @@ venv
 db.sqlite3
 .ipynb_checkpoints
 
+# vscode 
+.vscode
+
 #tmp and similar files
 .nfs*
 *.log

CONTRIBUTING.md

@@ -54,6 +54,7 @@ When making changes to MedCAT, make sure you have the dependencies defined in [r
 Please make sure the code additions are adequately tested and well documented.
 
 Before submitting a pull request, please ensure that the changes satisfy following:
+- The changes are based on the `master` branch (i.e merge the master branch in before submitting a PR)
 - There are no issues with types/mypy (run `python -m mypy --follow-imports=normal medcat` in the project root)
 - There are no issues with flake8 (run `flake8 medcat` in the project root)
 - All tests are successful (run `python -m unittest discover` in the project root)