Merge branch 'master' into change-uniqueness-rules-for-collections

docs/development.rst

@@ -13,15 +13,15 @@ Run the tests with, for example:
 Create migrations
 -----------------
 
-1. Create a database migration with `Alembic <https://alembic.sqlalchemy.org/>`__, for example:
+#. Create a database migration with `Alembic <https://alembic.sqlalchemy.org/>`__, for example:
 
    .. code-block:: bash
 
       alembic --config=mainalembic.ini revision -m "A short description of what the migration does"
 
-1. Fill in the migration
-1. Add/update tables, indexes and/or constraints in ``database.py`` to match the migration
-1. If a new table is created, update the ``delete_tables`` method
+#. Fill in the migration
+#. Add/update tables, indexes and/or constraints in ``database.py`` to match the migration
+#. If a new table is created, update the ``delete_tables`` method
 
 Note: Do not create simultaneous branches, each with its own migration(s). Instead, merge one branch, then create the next migration, to avoid `multiple heads <https://stackoverflow.com/questions/22342643/alembic-revision-multiple-heads-due-branching-error/>`__.
 

requirements.txt

@@ -1,56 +1,65 @@
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile
+#
+alembic==1.3.2
+asgiref==3.2.3            # via django
+attrs==19.3.0             # via jsonschema
+bleach==3.1.0             # via libcove, libcoveocds
+blinker==1.4
+cached-property==1.5.1    # via libcove, libcoveocds
+certifi==2019.11.28       # via requests, sentry-sdk
+chardet==3.0.4            # via requests
+click==7.0                # via flask
+commonmark==0.9.1         # via libcove, libcoveocds
+contextlib2==0.5.5        # via schema
+django==3.0               # via libcove, libcoveocds
+et-xmlfile==1.0.1         # via openpyxl
+flask==1.1.1
 flattentool==0.9.0
-libcoveocds==0.7.3
-ocdskit==0.1.3
-Flask==1.1.1
-alembic==1.2.1
+idna==2.8                 # via requests
+ijson==2.5.1              # via ocdskit
+importlib-metadata==1.3.0  # via jsonschema
+itsdangerous==1.1.0       # via flask
+jdcal==1.4.1              # via openpyxl
+jinja2==2.10.3            # via flask
+json-merge-patch==0.2     # via libcove, libcoveocds, ocdsextensionregistry
+jsonref==0.2              # via flattentool, libcove, libcoveocds, ocdskit, ocdsmerge
+jsonschema==3.2.0         # via libcove, libcoveocds, ocdskit
+libcove==0.12.2           # via libcoveocds
+libcoveocds==0.7.4
+lxml==4.4.2               # via flattentool
+mako==1.1.0               # via alembic
+markupsafe==1.1.1         # via jinja2, mako
+more-itertools==8.0.2     # via zipp
+ocdsextensionregistry==0.0.16  # via ocdskit
+ocdskit==0.1.4
+ocdsmerge==0.5.11
+openpyxl==3.0.2           # via flattentool
 pgpasslib==1.1.0
+prometheus-client==0.7.1
 psycopg2==2.8.4
-ocdsmerge==0.5.8
-blinker==1.4
+pyrsistent==0.15.6        # via jsonschema
+python-dateutil==2.8.1    # via alembic
+python-editor==1.0.4      # via alembic
+pytz==2019.3              # via django, flattentool
 redis==3.3.11
-sentry-sdk==0.13.1
-SQLAlchemy==1.2.19
-prometheus-client==0.7.1
-## The following requirements were added by pip freeze:
-attrs==19.3.0
-bleach==3.1.0
-cached-property==1.5.1
-certifi==2019.9.11
-chardet==3.0.4
-Click==7.0
-commonmark==0.9.1
-contextlib2==0.5.5
-Django==2.2.6
-et-xmlfile==1.0.1
-idna==2.8
-ijson==2.5.1
-importlib-metadata==0.23
-itsdangerous==1.1.0
-jdcal==1.4.1
-Jinja2==2.10.3
-json-merge-patch==0.2
-jsonref==0.2
-jsonschema==3.1.1
-libcove==0.11.0
-lxml==4.4.1
-Mako==1.1.0
-MarkupSafe==1.1.1
-more-itertools==7.2.0
-ocdsextensionregistry==0.0.15
-openpyxl==3.0.0
-pyrsistent==0.15.5
-python-dateutil==2.8.0
-python-editor==1.0.4
-pytz==2019.3
-requests==2.22.0
-requests-cache==0.5.2
-rfc3987==1.3.8
-schema==0.7.1
-six==1.12.0
-sqlparse==0.3.0
-strict-rfc3339==0.7
-urllib3==1.25.6
-webencodings==0.5.1
-Werkzeug==0.16.0
-xmltodict==0.12.0
-zipp==0.6.0
+requests-cache==0.5.2     # via ocdsextensionregistry
+requests==2.22.0          # via libcove, libcoveocds, ocdsextensionregistry, ocdskit, ocdsmerge, requests-cache
+rfc3987==1.3.8            # via ocdskit
+schema==0.7.1             # via flattentool
+sentry-sdk==0.13.5
+six==1.13.0               # via bleach, flattentool, jsonschema, pyrsistent, python-dateutil
+sqlalchemy==1.2.19
+sqlparse==0.3.0           # via django
+strict-rfc3339==0.7       # via ocdskit
+urllib3==1.25.7           # via requests, sentry-sdk
+webencodings==0.5.1       # via bleach
+werkzeug==0.16.0          # via flask
+xmltodict==0.12.0         # via flattentool
+zipp==0.6.0               # via importlib-metadata
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools

requirements_dev.in

@@ -1,4 +1,5 @@
--r requirements.in
+-r requirements.txt
+pip-tools
 coveralls
 flake8
 pytest

requirements_dev.txt

@@ -1,73 +1,81 @@
-flattentool==0.9.0
-libcoveocds==0.7.3
-ocdskit==0.1.3
-Flask==1.1.1
-alembic==1.2.1
-pgpasslib==1.1.0
-psycopg2==2.8.4
-ocdsmerge==0.5.8
-blinker==1.4
-redis==3.3.11
-sentry-sdk==0.13.1
-SQLAlchemy==1.2.19
-prometheus-client==0.7.1
-
-coveralls==1.8.2
-flake8==3.7.8
-pytest==5.2.2
-pytest-cov==2.8.1
-## The following requirements were added by pip freeze:
-atomicwrites==1.3.0
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile requirements_dev.in
+#
+alembic==1.3.2
+asgiref==3.2.3
 attrs==19.3.0
 bleach==3.1.0
+blinker==1.4
 cached-property==1.5.1
-certifi==2019.9.11
+certifi==2019.11.28
 chardet==3.0.4
-Click==7.0
+click==7.0
 commonmark==0.9.1
 contextlib2==0.5.5
-coverage==4.5.4
-Django==2.2.6
-docopt==0.6.2
-entrypoints==0.3
+coverage==4.5.4           # via coveralls, pytest-cov
+coveralls==1.9.2
+django==3.0
+docopt==0.6.2             # via coveralls
+entrypoints==0.3          # via flake8
 et-xmlfile==1.0.1
+flake8==3.7.9
+flask==1.1.1
+flattentool==0.9.0
 idna==2.8
 ijson==2.5.1
-importlib-metadata==0.23
+importlib-metadata==1.3.0
 itsdangerous==1.1.0
 jdcal==1.4.1
-Jinja2==2.10.3
+jinja2==2.10.3
 json-merge-patch==0.2
 jsonref==0.2
-jsonschema==3.1.1
-libcove==0.11.0
-lxml==4.4.1
-Mako==1.1.0
-MarkupSafe==1.1.1
-mccabe==0.6.1
-more-itertools==7.2.0
-ocdsextensionregistry==0.0.15
-openpyxl==3.0.0
-packaging==19.2
-pluggy==0.13.0
-py==1.8.0
-pycodestyle==2.5.0
-pyflakes==2.1.1
-pyparsing==2.4.2
-pyrsistent==0.15.5
-python-dateutil==2.8.0
+jsonschema==3.2.0
+libcove==0.12.2
+libcoveocds==0.7.4
+lxml==4.4.2
+mako==1.1.0
+markupsafe==1.1.1
+mccabe==0.6.1             # via flake8
+more-itertools==8.0.2
+ocdsextensionregistry==0.0.16
+ocdskit==0.1.4
+ocdsmerge==0.5.11
+openpyxl==3.0.2
+packaging==19.2           # via pytest
+pgpasslib==1.1.0
+pip-tools==4.3.0
+pluggy==0.13.1            # via pytest
+prometheus-client==0.7.1
+psycopg2==2.8.4
+py==1.8.0                 # via pytest
+pycodestyle==2.5.0        # via flake8
+pyflakes==2.1.1           # via flake8
+pyparsing==2.4.5          # via packaging
+pyrsistent==0.15.6
+pytest-cov==2.8.1
+pytest==5.3.2
+python-dateutil==2.8.1
 python-editor==1.0.4
 pytz==2019.3
-requests==2.22.0
+redis==3.3.11
 requests-cache==0.5.2
+requests==2.22.0
 rfc3987==1.3.8
 schema==0.7.1
-six==1.12.0
+sentry-sdk==0.13.5
+six==1.13.0
+sqlalchemy==1.2.19
 sqlparse==0.3.0
 strict-rfc3339==0.7
-urllib3==1.25.6
-wcwidth==0.1.7
+urllib3==1.25.7
+wcwidth==0.1.7            # via pytest
 webencodings==0.5.1
-Werkzeug==0.16.0
+werkzeug==0.16.0
 xmltodict==0.12.0
 zipp==0.6.0
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools