ccs-digitalmarketplace-frameworks 1.3.10 → 1.3.14

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/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/frameworks/g-cloud-13/questions/declaration/10WorkingDays.yml

@@ -1,6 +1,6 @@
 name: Signing and returning the framework agreement
 question: >
-  Do you agree to confirm and sign your framework agreement with an electronic signature within 10 days of it being issued by the Crown Commercial Service?
+  Do you agree to confirm and sign your framework agreement with an electronic signature within 10 calendar days of it being issued by the Crown Commercial Service?
 
 type: boolean
 assessment:

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

@@ -9,8 +9,8 @@ type: radios
 options:
   - label: "Yes – your organisation has, or will have in place, employer’s liability insurance of at least £5 million and you will provide certification before the framework is awarded."
   - label: "No - your organisation does not have, and will not have in place, employer’s liability insurance of at least £5 million before the framework is awarded."
-  - label: "Not applicable - your organisation does not need employer’s liability insurance because your organisation employs only the owner or close family members."
+  - label: "Not applicable - your organisation does not need employer’s liability insurance because your organisation employs only the owner or close family members or is exempt under Law."
 assessment:
   passIfIn:
     - "Yes – your organisation has, or will have in place, employer’s liability insurance of at least £5 million and you will provide certification before the framework is awarded."
-    - "Not applicable - your organisation does not need employer’s liability insurance because your organisation employs only the owner or close family members."
+    - "Not applicable - your organisation does not need employer’s liability insurance because your organisation employs only the owner or close family members or is exempt under Law."

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

@@ -1,6 +1,6 @@
-name: Invitation to apply
+name: Invitation to tender
 question: >
-  Do you agree to comply with the terms of the <a href="/suppliers/frameworks/g-cloud-13#guidance" target="_blank" rel="noopener noreferrer">G-Cloud&nbsp;13 ‘invitation to apply’ (link opens in a new tab)</a>?
+  Do you agree to comply with the terms of the <a href="/suppliers/frameworks/g-cloud-13#guidance" 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/declaration/unfairCompetition.yml

@@ -8,9 +8,8 @@ question: >
     - not given inducement or valuable consideration to another person (except where such communication takes place with people who are also participants in the application, or where disclosure is made in confidence to obtain necessary information or security for the application)
     - not canvassed, or attempted to buy information from, any government agent about this procurement
 
-hint: >
-    Answer ‘yes’ to confirm they have not done anything described in the question.
-    Answer ‘no’ if they have done anything described in the question.
+hint: Answer ‘yes’ to confirm they have not done anything described in the question.
+      Answer ‘no’ if they have done anything described in the question.
 
 type: boolean
 assessment:

package/package.json

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