ccs-digitalmarketplace-frameworks 1.3.9 → 1.3.13

package/frameworks/digital-outcomes-6/messages/homepage-sidebar.yml

@@ -8,7 +8,7 @@ open:
   heading: 'Digital Outcomes  6 is open for applications'
   messages:
     - 'You need an account to apply.'
-    - 'The application deadline is 1pm GMT, 15 November 2021.'
+    - 'The application deadline is 3pm GMT, 24 February 2022.'
 
 pending:
   heading: 'Digital Outcomes  6 is closed for applications'

package/frameworks/digital-outcomes-6/metadata/copy_services.yml

@@ -79,4 +79,5 @@ questions_to_exclude:
 - agileCoachPriceMax
 - dataScientistPriceMax
 - userResearcherPriceMax
+- securityTypes
 source_framework: digital-outcomes-and-specialists-5

package/frameworks/digital-outcomes-6/questions/declaration/mitigatingFactors3.yml

@@ -1,5 +1,5 @@
 name: Mitigating factors for Modern Slavery reporting requirements
-question: >
+question:
   If your organisation does not meet the requirements, explain why.
 type: textbox_large
 max_length_in_words: 500

package/frameworks/digital-outcomes-6/questions/declaration/modernSlaveryReportingRequirements.yml

@@ -1,5 +1,5 @@
 name: Modern slavery reporting requirements
-question: Does your organisation comply with the annual reporting requirements of section 54 of The Modern Slavery Act (2015)?
+question: Does your organisation comply with the annual reporting requirements of <a class="govuk-link" href="https://www.legislation.gov.uk/ukpga/2015/30/section/54" target="_blank" rel="noopener noreferrer">section 54 of The Modern Slavery Act (2015) (opens in new tab)</a>?
 hint: | 
   You must publish a slavery and human trafficking statement to comply with the act.
 

package/frameworks/digital-outcomes-6/questions/declaration/modernSlaveryStatementOptional.yml

@@ -1,4 +1,4 @@
-name: Modern slavery statement required
+name: Modern slavery statement optional
 question: >
   <p class="govuk-body">If you do not have a website you can choose to upload a copy of your organisation’s slavery and human trafficking statement.</p>
 

package/frameworks/digital-outcomes-6/questions/declaration/multiqModernSlavery.yml

@@ -6,8 +6,8 @@ type: multiquestion
 questions:
   - modernSlaveryTurnover
   - modernSlaveryReportingRequirements
-  - modernSlaveryStatement
   - modernSlaveryStatementWeb
+  - modernSlaveryStatement
   - mitigatingFactors3
   - modernSlaveryOptionalWeb
   - modernSlaveryStatementOptional

package/frameworks/digital-outcomes-6/questions/declaration/termsOfParticipation.yml

@@ -1,4 +1,4 @@
-name: Invitation to apply
+name: Invitation to tender
 question: >
   Do you agree to comply with the terms of the <a class="govuk-link" href="https://www.contractsfinder.service.gov.uk/Notice/08c8b0bc-ed2d-4698-8dc8-87512455eb8e" target="_blank" rel="noopener noreferrer">Digital Outcomes&nbsp;6 ‘invitation to tender’ (opens in new tab)</a>?
 type: boolean

package/frameworks/g-cloud-13/manifests/declaration.yml

@@ -131,13 +131,8 @@
     - helpBuyersComplyTechnologyCodesOfPractice
     - publishContracts
     - supplierCodeOfConduct
-    - serviceDesignPrinciples
-    - financialContractual
-    - updateTransparencyPrinciples
-    - securityClassifications
     - protectPersonalData
-    - skillsAndCapabilities
-    - measureCustomerSatisfaction
+
 
 -
   name: How you apply

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccs-digitalmarketplace-frameworks",
-  "version": "1.3.9",
+  "version": "1.3.13",
   "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

@@ -31,7 +31,7 @@ contextlib2==0.6.0.post1
     # via digitalmarketplace-utils
 cryptography==2.3.1
     # via digitalmarketplace-utils
-deepmerge==0.2.1
+deepmerge==1.0.1
     # via -r requirements-dev.in
 defusedxml==0.7.1
     # via odfpy

package/requirements.txt

@@ -1,4 +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

package/tests/test_generate_validation_schema.py

@@ -3,7 +3,7 @@ from math import isnan
 import os
 
 try:
-    import __builtin__ as builtins
+    import builtins as builtins
 except ImportError:
     import builtins