ccs-digitalmarketplace-frameworks 1.3.44 → 1.4.1

package/SECURITY.md

@@ -0,0 +1,7 @@
+Contact: cybersecurity@crowncommercial.gov.uk
+
+Policy: https://www.crowncommercial.gov.uk/vulnerability-disclosure-policy
+
+Acknowledgements: https://www.crowncommercial.gov.uk/vulnerability-disclosure-policy/acknowledgements
+
+Encryption: https://github.com/Crown-Commercial-Service/ccs-vulnerability-disclosure-policy/blob/main/vulnerability-disclosure-public-encryption.pub

package/frameworks/digital-outcomes-6/messages/urls.yml

@@ -1,4 +1,3 @@
 call_off_contract_url: https://www.gov.uk/guidance/digital-outcomes-and-specialists-6-legal-documents/__placeholder__
-framework_agreement_pdf_url: https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/947688/DOS5-framework-award-form.odt/__placeholder__
-framework_agreement_url: https://www.gov.uk/guidance/digital-outcomes-and-specialists-6-legal-documents/__placeholder__
+framework_agreement_url: https://www.crowncommercial.gov.uk/digital-outcomes-6-contract-terms-and-conditions/
 supplier_guide_url: https://www.gov.uk/guidance/how-to-apply-to-sell-on-the-digital-outcomes-framework

package/frameworks/g-cloud-13/questions/declaration/servicesHaveOrSupportCloudSupport.yml

@@ -3,7 +3,7 @@ question: >
   If you're submitting a cloud support (lot 3) service, does your service both:
 
     - enable the delivery of cloud services
-    - comply with the <a href="https://www.contractsfinder.service.gov.uk/Notice/738f069d-8b0d-4586-a05d-7a8113e30805" target="_blank" rel="noopener noreferrer">definition of cloud support in the framework agreement</a>
+    - comply with the <a href="https://www.contractsfinder.service.gov.uk/Notice/52e2fd33-e6f3-4a4c-8697-d25ab76ea0a9" target="_blank" rel="noopener noreferrer">definition of cloud support in the framework agreement</a>
 
 type: radios
 options:

package/frameworks/g-cloud-13/questions/declaration/termsAndConditions.yml

@@ -1,6 +1,6 @@
 name: Terms and conditions
 question: >
-  Do you accept the terms and conditions in the <a href="https://www.contractsfinder.service.gov.uk/Notice/738f069d-8b0d-4586-a05d-7a8113e30805" target="_blank" rel="noopener noreferrer">framework agreement and call-off contract documents (link opens in a new tab)</a>?
+  Do you accept the terms and conditions in the <a href="https://www.contractsfinder.service.gov.uk/Notice/52e2fd33-e6f3-4a4c-8697-d25ab76ea0a9" target="_blank" rel="noopener noreferrer">framework agreement and call-off contract documents (link opens in a new tab)</a>?
 type: boolean
 assessment:
   passIfIn:

package/frameworks/g-cloud-13/questions/declaration/termsOfParticipation.yml

@@ -1,6 +1,6 @@
 name: Invitation to tender
 question: >
-  Do you agree to comply with the terms of the <a href="https://www.contractsfinder.service.gov.uk/Notice/738f069d-8b0d-4586-a05d-7a8113e30805" target="_blank" rel="noopener noreferrer">G-Cloud&nbsp;13 ‘invitation to tender’ (link opens in a new tab)</a>?
+  Do you agree to comply with the terms of the <a href="https://www.contractsfinder.service.gov.uk/Notice/52e2fd33-e6f3-4a4c-8697-d25ab76ea0a9" target="_blank" rel="noopener noreferrer">G-Cloud&nbsp;13 ‘invitation to tender’ (link opens in a new tab)</a>?
 type: boolean
 assessment:
   passIfIn:

package/frameworks/g-cloud-13/questions/services/securityTestingAccredited.yml

@@ -1,7 +1,7 @@
 name: Certified security testers
 question: Is your security testing performed by certified security testers?
 hint: Security testing includes penetration testing and IT Health Checks.
-
+hidden: true
 depends:
   - "on": lot
     being:

package/frameworks/g-cloud-13/questions/services/securityTestingCCP.yml

@@ -1,6 +1,6 @@
 name: Certified Professional (CCP) risk analysts
 question: Are your risk analysts Certified Professional (CCP) scheme-accredited?
-
+hidden: true
 depends:
   - "on": lot
     being:

package/frameworks/g-cloud-13/questions/services/securityTestingWhat.yml

@@ -12,7 +12,7 @@ followup:
   securityTestingAccredited:
     - security_testing
   securityTestingCCP:
-    - risk_analysis
+    - security_risk_management
 
 type: checkboxes
 options:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccs-digitalmarketplace-frameworks",
-  "version": "1.3.44",
+  "version": "1.4.1",
   "description": "Data files for Digital Marketplace’s procurement frameworks",
   "repository": "git@github.com:Brickendon-DMp1-5/digitalmarketplace-frameworks",
   "author": "enquiries@digitalmarketplace.service.gov.uk"

package/requirements-dev.txt

@@ -1,11 +1,9 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.9
 # To update, run:
 #
 #    pip-compile requirements-dev.in
 #
-asn1crypto==1.4.0
-    # via cryptography
 attrs==20.3.0
     # via
     #   hypothesis
@@ -19,6 +17,8 @@ botocore==1.20.55
     # via
     #   boto3
     #   s3transfer
+cachelib==0.6.0
+    # via flask-session
 certifi==2020.12.5
     # via requests
 cffi==1.14.5
@@ -29,15 +29,19 @@ click==7.1.2
     # via flask
 contextlib2==0.6.0.post1
     # via digitalmarketplace-utils
-cryptography==2.3.1
+cryptography==36.0.1
     # via digitalmarketplace-utils
 deepmerge==1.0.1
-    # via -r requirements-dev.in
+    # via
+    #   -r requirements-dev.in
+    #   -r requirements.txt
 defusedxml==0.7.1
     # via odfpy
-git+https://github.com/alphagov/digitalmarketplace-content-loader.git@7.22.0#egg=digitalmarketplace-content-loader==7.22.0
+deprecated==1.2.13
+    # via redis
+digitalmarketplace-content-loader==9.1.0
     # via -r requirements.txt
-git+https://github.com/alphagov/digitalmarketplace-utils.git@52.10.0#egg=digitalmarketplace-utils==52.10.0
+digitalmarketplace-utils==60.8.1
     # via
     #   -r requirements.txt
     #   digitalmarketplace-content-loader
@@ -47,23 +51,23 @@ docopt==0.6.2
     #   notifications-python-client
 flake8==3.9.1
     # via -r requirements-dev.in
-flask-gzip==0.2
-    # via digitalmarketplace-utils
-flask-login==0.5.0
-    # via digitalmarketplace-utils
-flask-script==2.0.6
-    # via digitalmarketplace-utils
-flask-wtf==0.14.3
-    # via digitalmarketplace-utils
 flask==1.0.4
     # via
     #   digitalmarketplace-content-loader
     #   digitalmarketplace-utils
     #   flask-gzip
     #   flask-login
-    #   flask-script
+    #   flask-session
     #   flask-wtf
     #   gds-metrics
+flask-gzip==0.2
+    # via digitalmarketplace-utils
+flask-login==0.5.0
+    # via digitalmarketplace-utils
+flask-session==0.4.0
+    # via digitalmarketplace-utils
+flask-wtf==0.14.3
+    # via digitalmarketplace-utils
 fleep==1.0.1
     # via digitalmarketplace-utils
 future==0.18.2
@@ -75,9 +79,7 @@ govuk-country-register==0.5.0
 hypothesis==6.10.0
     # via -r requirements-dev.in
 idna==2.10
-    # via
-    #   cryptography
-    #   requests
+    # via requests
 inflection==0.5.1
     # via digitalmarketplace-content-loader
 iniconfig==1.1.1
@@ -96,7 +98,7 @@ jmespath==0.10.0
     #   botocore
 jsonschema==3.2.0
     # via -r requirements-dev.in
-mailchimp3==3.0.6
+mailchimp3==3.0.17
     # via digitalmarketplace-utils
 markdown==2.6.11
     # via digitalmarketplace-content-loader
@@ -115,7 +117,9 @@ notifications-python-client==5.7.1
 odfpy==1.4.1
     # via digitalmarketplace-utils
 packaging==20.9
-    # via pytest
+    # via
+    #   pytest
+    #   redis
 pluggy==0.13.1
     # via pytest
 prometheus-client==0.10.1
@@ -128,7 +132,7 @@ pycparser==2.20
     # via cffi
 pyflakes==2.3.1
     # via flake8
-pyjwt==2.0.1
+pyjwt==2.4.0
     # via notifications-python-client
 pyparsing==2.4.7
     # via packaging
@@ -138,7 +142,7 @@ pytest==6.2.3
     # via -r requirements-dev.in
 python-dateutil==2.8.1
     # via botocore
-git+https://github.com/madzak/python-json-logger.git@v0.1.11#egg=python-json-logger==v0.1.11
+python-json-logger==2.0.2
     # via
     #   -r requirements.txt
     #   digitalmarketplace-utils
@@ -148,6 +152,8 @@ pyyaml==5.4.1
     # via
     #   -r requirements-dev.in
     #   digitalmarketplace-content-loader
+redis==4.1.4
+    # via digitalmarketplace-utils
 requests==2.25.1
     # via
     #   digitalmarketplace-utils
@@ -157,7 +163,6 @@ s3transfer==0.4.1
     # via boto3
 six==1.15.0
     # via
-    #   cryptography
     #   jsonschema
     #   python-dateutil
 sortedcontainers==2.3.0
@@ -171,11 +176,11 @@ urllib3==1.26.5
     #   botocore
     #   requests
 werkzeug==1.0.1
-    # via
-    #   digitalmarketplace-utils
-    #   flask
+    # via flask
 workdays==1.4
     # via digitalmarketplace-utils
+wrapt==1.14.0
+    # via deprecated
 wtforms==2.3.3
     # via flask-wtf
 

package/requirements.txt

@@ -1,5 +1,5 @@
 docopt==0.6.2
 deepmerge==1.0.1
-git+https://github.com/madzak/python-json-logger.git@v0.1.11#egg=python-json-logger==v0.1.11
-git+https://github.com/alphagov/digitalmarketplace-content-loader.git@7.22.0#egg=digitalmarketplace-content-loader==7.22.0
-git+https://github.com/alphagov/digitalmarketplace-utils.git@52.10.0#egg=digitalmarketplace-utils==52.10.0
+python-json-logger==2.0.2
+digitalmarketplace-content-loader==9.1.0
+digitalmarketplace-utils==60.8.1

package/tests/test_content.py

@@ -37,7 +37,7 @@ MANIFEST_QUESTION_SET = {
 # `item` property wouldn't usually be part of a brief response but is included here as the dynamic list child question
 # `evidence` relies on an `item` in its context to render
 QUESTION_SET_CONTEXT = {
-    'briefs': {'lot': 'context-lot'},
+    'briefs': {'lot': 'context-lot', 'lotSlug': 'context-lot-slug'},
     'brief-responses': {
         'lot': 'context-lot',
         'brief': mock.MagicMock(),