Merge branch 'release/4.17.1'

.github/workflows/dbdocs.yml

@@ -27,8 +27,9 @@ jobs:
         uses: actions/setup-node@v2-beta
         with:
           node-version: ${{ env.NODE_VERSION }}
+      # dbdocs is pinned to 0.8 until django-dbml supports 0.9+
       - name: Install dbdocs
-        run: npm install -g dbdocs
+        run: npm install -g dbdocs@0.8
       - name: Check dbdocs
         run: dbdocs
       # Python version to use is stored in the .python-version file, which is the
@@ -46,7 +47,7 @@ jobs:
 
       # Build and publish dbdocs
       - name: Generate DBML
-        run: python manage.py dbml corpus common footnotes djiffy contenttypes admin auth > geniza.dbml
+        run: python manage.py dbml corpus common footnotes djiffy contenttypes admin auth entities > geniza.dbml
       - name: Push to dbdocs
         env:
           DBDOCS_TOKEN: ${{ secrets.DBDOCS_TOKEN }}

CHANGELOG.rst

@@ -1,6 +1,11 @@
 Change Log
 ==========
 
+4.17.1
+------
+
+- bugfix: Pin django-dbml to 0.7 and dbdocs to 0.8, until django-dbml supports dbdocs 0.9+
+
 4.17
 ----
 

geniza/__init__.py

@@ -1,4 +1,4 @@
-__version_info__ = (4, 17, 0, None)
+__version_info__ = (4, 17, 1, None)
 
 
 # Dot-connect all but the last. Last is dash-connected if not None.

requirements.lock

@@ -26,7 +26,7 @@ django-autocomplete-light==3.11.0
 django-cas-ng==4.3.0
 django-csp==3.7
 django-csp-helpers==0.6.2
-django-dbml==0.6.0
+django-dbml==0.7.0
 django-debug-toolbar==3.7.0
 django-filter==21.1
 django-fixture-magic==0.1.5

requirements/test.txt

@@ -6,6 +6,6 @@ pytest>=4.6 # required for pytest-cov
 pytest-django>=4.1.0,<4.5.0
 pytest-cov
 wheel
-django-dbml>=0.6.0
+django-dbml>=0.7.0
 percy-selenium
 selenium>=4.8.0