update precommit versions (#44)

.pre-commit-config.yaml

@@ -6,7 +6,7 @@ exclude: |
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: trailing-whitespace
       - id: check-added-large-files
@@ -35,12 +35,12 @@ repos:
             "--ignore=E501,E402,W503,W504,E731",
           ]
   - repo: https://github.com/pycqa/flake8
-    rev: 6.1.0
+    rev: 7.0.0
     hooks:
       - id: flake8
         args: ["--ignore=E501,E402,W503,W504,E731,F401"]
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.1.0
+    rev: v4.0.0-alpha.8
     hooks:
       - id: prettier
         types_or: [css, yaml, markdown, html, scss, javascript]

README.rst

@@ -133,5 +133,6 @@ This project is configured with GitHub Actions to automatically release to PyPi
 * Once deployed to main, create a new tag in GitHub against main and copy the change log notes into the tag description
 * GitHub Actions will automatically prepare the release the new version to PyPi
 * Go to GitHub actions to approve the release
+* After merging into main, then in the command line with the develop branch run `git merge origin main` and push the changes. This might have to be done with a person with elevated privileges to bypass the protected branch settings.
 
 The GitHub Action required updates to the GitHub repo to only release on tags (https://github.com/SEED-platform/py-seed/settings/environments) after approval and on PyPi to add an authorized publisher (https://pypi.org/manage/project/py-SEED/settings/publishing/).