ccs-digitalmarketplace-frameworks 1.8.21 → 1.8.22

package/.github/dependabot.yml

@@ -6,8 +6,6 @@ updates:
     interval: weekly
     time: "03:00"
   open-pull-requests-limit: 10
-  allow:
-  - dependency-type: production
 - package-ecosystem: "github-actions"
   directory: "/"
   schedule:

package/.github/workflows/publish_package.yml

@@ -12,7 +12,7 @@ jobs:
 
     - uses: actions/checkout@v4
     # Setup .npmrc file to publish to npm
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v4
       with:
         node-version: '${{ steps.nvm.outputs.NVMRC }}'
         registry-url: 'https://registry.npmjs.org'

package/.github/workflows/test.yml

@@ -37,10 +37,8 @@ jobs:
       matrix:
         python-version: [3.9]
         script:
-          - scripts/generate-assessment-schema.py g-cloud-12
-          - scripts/generate-assessment-schema.py digital-outcomes-and-specialists-5
-          - scripts/generate-search-config.py g-cloud-12 services --output-path=/tmp
-          - scripts/generate-search-config.py digital-outcomes-and-specialists-5 briefs --output-path=/tmp
+          - scripts/generate-assessment-schema.py g-cloud-14
+          - scripts/generate-search-config.py g-cloud-14 services --output-path=/tmp
           - scripts/generate-validation-schemas.py --output-path=/tmp
 
     steps:

package/frameworks/g-cloud-14/manifests/display_service.yml

@@ -271,11 +271,7 @@
 
 - name: Social Value
   questions:
-    - multiqfightingClimateChange
-    - multiqcovid19Recovery
-    - multiqtacklingEconomicInequality
-    - multiqequalOpportunity
-    - multiqwellbeing
+    - multiqSocialValue
 
 - name: Pricing
   questions:

package/frameworks/g-cloud-14/manifests/edit_service_as_admin.yml

@@ -226,11 +226,7 @@
 
   editable: True
   questions:
-    - multiqfightingClimateChange
-    - multiqcovid19Recovery
-    - multiqtacklingEconomicInequality
-    - multiqequalOpportunity
-    - multiqwellbeing
+    - multiqSocialValue
 
 - name: Pricing
   editable: True

package/frameworks/g-cloud-14/manifests/edit_submission.yml

@@ -251,21 +251,10 @@
     - multiqEnergyEfficiency
 
 - name: Social Value
-  summary_page_description: >
-    Please provide further information about how your G-Cloud service provision will deliver against <b> at least one or more of the following 
-              <a href="https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/921437/PPN-06_20-Taking-Account-of-Social-Value-in-the-Award-of-Central-Government-Contracts.pdf" target="_blank" rel="noopener noreferrer">Social Value themes outlined in PPN 06/20</a></b>.
-    </br>
-    </br>
-    It is expected that public sector buyers will request clarifications on Social Value and/or the information you provide as part of the G-Cloud buying process.
-
   editable: False
   edit_questions: True
   questions:
-    - multiqfightingClimateChange
-    - multiqcovid19Recovery
-    - multiqtacklingEconomicInequality
-    - multiqequalOpportunity
-    - multiqwellbeing
+    - multiqSocialValue
 
 - name: Pricing
   editable: False

package/frameworks/g-cloud-14/metadata/copy_services.yml

@@ -1,12 +1,7 @@
 questions_to_exclude:
-- staffSecurityClearanceChecks
-- serviceDefinitionDocumentURL
-- termsAndConditionsDocumentURL
-- pricingDocumentURL
-- sfiaRateDocumentURL
-- dataStorageAndProcessing
-- dataStorageAndProcessingLocations
-- dataStorageAndProcessingUserControl
-- browsersAccess
-- browsersSupported
+  - fightingClimateChange
+  - covid19Recovery
+  - tacklingEconomicInequality
+  - equalOpportunity
+  - wellbeing
 source_framework: g-cloud-13

package/frameworks/g-cloud-14/questions/services/covid19Recovery.yml

@@ -1,5 +1,5 @@
 name: Covid-19 recovery
-question: ""
+question: Covid-19 recovery
 
 depends:
   - "on": lot
@@ -10,11 +10,12 @@ depends:
 
 type: textbox_large
 max_length_in_words: 300
+hidden: true
 
 validations:
   - name: answer_required
-    message: Please complete at least one of the following Social Value fields.
+    message: You need to answer this question because you selected ‘Covid-19 recovery’ as a Social Value
   - name: under_300_words
-    message: Description must be 300 words or fewer.
+    message: Your answer must be no more than 300 words
   - name: under_character_limit
-    message: Description must be 3000 characters or fewer.
+    message: Description must be 3000 characters or fewer

package/frameworks/g-cloud-14/questions/services/equalOpportunity.yml

@@ -1,5 +1,5 @@
 name: Equal opportunity
-question: ""
+question: Equal opportunity
 
 depends:
   - "on": lot
@@ -10,11 +10,12 @@ depends:
 
 type: textbox_large
 max_length_in_words: 300
+hidden: true
 
 validations:
   - name: answer_required
-    message: Please complete at least one of the following Social Value fields.
+    message: You need to answer this question because you selected ‘Equal opportunity’ as a Social Value
   - name: under_300_words
-    message: Description must be 300 words or fewer.
+    message: Your answer must be no more than 300 words
   - name: under_character_limit
-    message: Description must be 3000 characters or fewer.
+    message: Description must be 3000 characters or fewer

package/frameworks/g-cloud-14/questions/services/fightingClimateChange.yml

@@ -1,5 +1,5 @@
 name: Fighting climate change
-question:  ""
+question: Fighting climate change
 
 depends:
   - "on": lot
@@ -10,11 +10,12 @@ depends:
 
 type: textbox_large
 max_length_in_words: 300
+hidden: true
 
 validations:
   - name: answer_required
-    message: Please complete at least one of the following Social Value fields.
+    message: You need to answer this question because you selected ‘Fighting climate change’ as a Social Value.
   - name: under_300_words
-    message: Description must be 300 words or fewer.
+    message: Your answer must be no more than 300 words
   - name: under_character_limit
-    message: Description must be 3000 characters or fewer.
+    message: Description must be 3000 characters or fewer

package/frameworks/g-cloud-14/questions/services/multiqSocialValue.yml

@@ -1,5 +1,5 @@
-name: Social value
-question: Social value
+name: Social Value
+question: ""
 
 depends:
   - "on": lot
@@ -10,8 +10,9 @@ depends:
 
 type: multiquestion
 questions:
-  - multiqfightingClimateChange
-  - multiqcovid19Recovery
-  - multiqtacklingEconomicInequality
-  - multiqequalOpportunity
-  - multiqwellbeing
+  - socialValue
+  - fightingClimateChange
+  - covid19Recovery
+  - tacklingEconomicInequality
+  - equalOpportunity
+  - wellbeing

package/frameworks/g-cloud-14/questions/services/socialValue.yml

@@ -0,0 +1,50 @@
+name: Social Value
+question: |
+  You must provide further information about how your G-Cloud service provision will deliver against at least one or more of the following <a class="govuk-link" href="https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/921437/PPN-06_20-Taking-Account-of-Social-Value-in-the-Award-of-Central-Government-Contracts.pdf" target="_blank">Social Value themes outlined in PPN 06/20 (opens in new tab)</a>:
+
+  <ul class="govuk-list govuk-list--bullet govuk-!-margin-top-2 govuk-!-margin-bottom-2">
+    <li>Fighting climate change</li>
+    <li>Covid-19 recovery</li>
+    <li>Tackling economic inequality</li>
+    <li>Equal opportunity</li>
+    <li>Wellbeing</li>
+  </ul>
+
+question_advice: |
+  It is expected that public sector buyers will request clarifications on Social Value and/or the information you provide as part of the G-Cloud buying process.
+
+depends:
+  - "on": lot
+    being:
+      - cloud-hosting
+      - cloud-software
+      - cloud-support
+
+followup:
+  fightingClimateChange:
+    - fighting_climate_change
+  covid19Recovery:
+    - covid_19_recovery
+  tacklingEconomicInequality:
+    - tackling_economic_inequality
+  equalOpportunity:
+    - equal_opportunity
+  wellbeing:
+    - wellbeing
+
+type: checkboxes
+options:
+  - label: Fighting climate change
+    value: fighting_climate_change
+  - label: Covid-19 recovery
+    value: covid_19_recovery
+  - label: Tackling economic inequality
+    value: tackling_economic_inequality
+  - label: Equal opportunity
+    value: equal_opportunity
+  - label: Wellbeing
+    value: wellbeing
+
+validations:
+  - name: answer_required
+    message: You must select at least one Social Value option

package/frameworks/g-cloud-14/questions/services/tacklingEconomicInequality.yml

@@ -1,5 +1,5 @@
 name: Tackling economic inequality
-question: ""
+question: Tackling economic inequality
 
 depends:
   - "on": lot
@@ -10,11 +10,12 @@ depends:
 
 type: textbox_large
 max_length_in_words: 300
+hidden: true
 
 validations:
   - name: answer_required
-    message: Please complete at least one of the following Social Value fields.
+    message: You need to answer this question because you selected ‘Tackling economic inequality’ as a Social Value
   - name: under_300_words
-    message: Description must be 300 words or fewer.
+    message: Your answer must be no more than 300 words
   - name: under_character_limit
-    message: Description must be 3000 characters or fewer.
+    message: Description must be 3000 characters or fewer

package/frameworks/g-cloud-14/questions/services/wellbeing.yml

@@ -1,5 +1,5 @@
 name: Wellbeing
-question: ""
+question: Wellbeing
 
 depends:
   - "on": lot
@@ -8,15 +8,14 @@ depends:
       - cloud-software
       - cloud-support
 
-
-
 type: textbox_large
 max_length_in_words: 300
+hidden: true
 
 validations:
   - name: answer_required
-    message: Please complete at least one of the following Social Value fields.
+    message: You need to answer this question because you selected ‘Wellbeing’ as a Social Value
   - name: under_300_words
-    message: Description must be 300 words or fewer.
+    message: Your answer must be no more than 300 words
   - name: under_character_limit
-    message: Description must be 3000 characters or fewer.
+    message: Description must be 3000 characters or fewer

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccs-digitalmarketplace-frameworks",
-  "version": "1.8.21",
+  "version": "1.8.22",
   "description": "Data files for Digital Marketplace’s procurement frameworks",
   "repository": "git@github.com:Crown-Commercial-Service/ccs-digitalmarketplace-frameworks",
   "author": "enquiries@digitalmarketplace.service.gov.uk"

package/requirements-dev.txt

@@ -4,57 +4,87 @@
 #
 #    pip-compile requirements-dev.in
 #
-attrs==20.3.0
+async-timeout==4.0.3
+    # via
+    #   -r requirements.txt
+    #   redis
+attrs==23.1.0
     # via
     #   hypothesis
     #   jsonschema
-    #   pytest
-blinker==1.4
-    # via gds-metrics
-boto3==1.17.55
-    # via ccs-digitalmarketplace-utils
-botocore==1.20.55
+    #   referencing
+blinker==1.6.3
     # via
+    #   -r requirements.txt
+    #   gds-metrics
+boto3==1.28.71
+    # via
+    #   -r requirements.txt
+    #   ccs-digitalmarketplace-utils
+botocore==1.31.71
+    # via
+    #   -r requirements.txt
     #   boto3
     #   s3transfer
-cachelib==0.6.0
-    # via flask-session
-ccs-digitalmarketplace-content-loader==9.3.0
+cachelib==0.10.2
+    # via
+    #   -r requirements.txt
+    #   flask-session
+ccs-digitalmarketplace-apiclient==25.0.0
+    # via
+    #   -r requirements.txt
+    #   ccs-digitalmarketplace-utils
+ccs-digitalmarketplace-content-loader==10.0.0
     # via -r requirements.txt
-ccs-digitalmarketplace-utils==62.2.0
+ccs-digitalmarketplace-utils==63.0.0
     # via
     #   -r requirements.txt
     #   ccs-digitalmarketplace-content-loader
 certifi==2023.7.22
-    # via requests
-cffi==1.14.5
-    # via cryptography
-charset-normalizer==3.2.0
-    # via requests
+    # via
+    #   -r requirements.txt
+    #   requests
+cffi==1.16.0
+    # via
+    #   -r requirements.txt
+    #   cryptography
+charset-normalizer==3.3.1
+    # via
+    #   -r requirements.txt
+    #   requests
 click==7.1.2
-    # via flask
-contextlib2==0.6.0.post1
-    # via ccs-digitalmarketplace-utils
-cryptography==41.0.4
-    # via ccs-digitalmarketplace-utils
-deepmerge==1.0.1
+    # via
+    #   -r requirements.txt
+    #   flask
+contextlib2==21.6.0
+    # via
+    #   -r requirements.txt
+    #   ccs-digitalmarketplace-utils
+cryptography==41.0.5
+    # via
+    #   -r requirements.txt
+    #   ccs-digitalmarketplace-utils
+deepmerge==1.1.0
     # via
     #   -r requirements-dev.in
     #   -r requirements.txt
 defusedxml==0.7.1
-    # via odfpy
-deprecated==1.2.13
-    # via redis
-digitalmarketplace-apiclient==23.2.0
-    # via ccs-digitalmarketplace-utils
+    # via
+    #   -r requirements.txt
+    #   odfpy
 docopt==0.6.2
     # via
     #   -r requirements.txt
     #   notifications-python-client
-flake8==3.9.1
+exceptiongroup==1.1.3
+    # via
+    #   hypothesis
+    #   pytest
+flake8==6.1.0
     # via -r requirements-dev.in
-flask==1.0.4
+flask==1.1.4
     # via
+    #   -r requirements.txt
     #   ccs-digitalmarketplace-content-loader
     #   ccs-digitalmarketplace-utils
     #   flask-gzip
@@ -63,129 +93,189 @@ flask==1.0.4
     #   flask-wtf
     #   gds-metrics
 flask-gzip==0.2
-    # via ccs-digitalmarketplace-utils
-flask-login==0.5.0
-    # via ccs-digitalmarketplace-utils
-flask-session==0.4.0
-    # via ccs-digitalmarketplace-utils
-flask-wtf==0.14.3
-    # via ccs-digitalmarketplace-utils
+    # via
+    #   -r requirements.txt
+    #   ccs-digitalmarketplace-utils
+flask-login==0.6.2
+    # via
+    #   -r requirements.txt
+    #   ccs-digitalmarketplace-utils
+flask-session==0.4.1
+    # via
+    #   -r requirements.txt
+    #   ccs-digitalmarketplace-utils
+flask-wtf==1.2.1
+    # via
+    #   -r requirements.txt
+    #   ccs-digitalmarketplace-utils
 fleep==1.0.1
-    # via ccs-digitalmarketplace-utils
-future==0.18.3
-    # via notifications-python-client
+    # via
+    #   -r requirements.txt
+    #   ccs-digitalmarketplace-utils
 gds-metrics==0.2.4
-    # via ccs-digitalmarketplace-utils
+    # via
+    #   -r requirements.txt
+    #   ccs-digitalmarketplace-utils
 govuk-country-register==0.5.0
-    # via ccs-digitalmarketplace-utils
-hypothesis==6.10.0
+    # via
+    #   -r requirements.txt
+    #   ccs-digitalmarketplace-utils
+hypothesis==6.88.1
     # via -r requirements-dev.in
-idna==2.10
-    # via requests
+idna==3.4
+    # via
+    #   -r requirements.txt
+    #   requests
+importlib-metadata==6.8.0
+    # via
+    #   -r requirements.txt
+    #   markdown
 inflection==0.5.1
-    # via ccs-digitalmarketplace-content-loader
+    # via
+    #   -r requirements.txt
+    #   ccs-digitalmarketplace-content-loader
 iniconfig==1.1.1
     # via pytest
 itsdangerous==1.1.0
     # via
+    #   -r requirements.txt
     #   flask
     #   flask-wtf
 jinja2==2.11.3
     # via
+    #   -r requirements.txt
     #   ccs-digitalmarketplace-content-loader
     #   flask
-jmespath==0.10.0
+jmespath==1.0.1
     # via
+    #   -r requirements.txt
     #   boto3
     #   botocore
-jsonschema==3.2.0
+jsonschema==4.19.2
     # via -r requirements-dev.in
+jsonschema-specifications==2023.7.1
+    # via jsonschema
 mailchimp3==3.0.21
-    # via ccs-digitalmarketplace-utils
-markdown==2.6.11
-    # via ccs-digitalmarketplace-content-loader
-markupsafe==1.1.1
     # via
+    #   -r requirements.txt
+    #   ccs-digitalmarketplace-utils
+markdown==3.5
+    # via
+    #   -r requirements.txt
+    #   ccs-digitalmarketplace-content-loader
+markupsafe==2.0.1
+    # via
+    #   -r requirements.txt
+    #   ccs-digitalmarketplace-utils
     #   jinja2
     #   wtforms
-mccabe==0.6.1
+mccabe==0.7.0
     # via flake8
-mock==4.0.3
+mock==5.1.0
     # via -r requirements-dev.in
-monotonic==1.6
-    # via notifications-python-client
-notifications-python-client==5.7.1
-    # via ccs-digitalmarketplace-utils
+notifications-python-client==8.1.0
+    # via
+    #   -r requirements.txt
+    #   ccs-digitalmarketplace-utils
 odfpy==1.4.1
-    # via ccs-digitalmarketplace-utils
-packaging==20.9
     # via
-    #   pytest
-    #   redis
-pluggy==0.13.1
+    #   -r requirements.txt
+    #   ccs-digitalmarketplace-utils
+packaging==20.9
     # via pytest
-prometheus-client==0.10.1
-    # via gds-metrics
-py==1.10.0
+pluggy==0.13.1
     # via pytest
-pycodestyle==2.7.0
+prometheus-client==0.17.1
+    # via
+    #   -r requirements.txt
+    #   gds-metrics
+pycodestyle==2.11.1
     # via flake8
-pycparser==2.20
-    # via cffi
-pyflakes==2.3.1
+pycparser==2.21
+    # via
+    #   -r requirements.txt
+    #   cffi
+pyflakes==3.1.0
     # via flake8
-pyjwt==2.4.0
-    # via notifications-python-client
+pyjwt==2.8.0
+    # via
+    #   -r requirements.txt
+    #   notifications-python-client
 pyparsing==2.4.7
     # via packaging
-pyrsistent==0.17.3
-    # via jsonschema
-pytest==6.2.3
+pytest==7.4.3
     # via -r requirements-dev.in
-python-dateutil==2.8.1
-    # via botocore
+python-dateutil==2.8.2
+    # via
+    #   -r requirements.txt
+    #   botocore
 python-json-logger==2.0.7
     # via
     #   -r requirements.txt
     #   ccs-digitalmarketplace-utils
-pytz==2021.1
-    # via ccs-digitalmarketplace-utils
-pyyaml==5.4.1
+pytz==2023.3.post1
+    # via
+    #   -r requirements.txt
+    #   ccs-digitalmarketplace-utils
+pyyaml==6.0.1
     # via
     #   -r requirements-dev.in
+    #   -r requirements.txt
     #   ccs-digitalmarketplace-content-loader
-redis==4.1.4
-    # via ccs-digitalmarketplace-utils
+redis==5.0.1
+    # via
+    #   -r requirements.txt
+    #   ccs-digitalmarketplace-utils
+referencing==0.30.2
+    # via
+    #   jsonschema
+    #   jsonschema-specifications
 requests==2.31.0
     # via
+    #   -r requirements.txt
+    #   ccs-digitalmarketplace-apiclient
     #   ccs-digitalmarketplace-utils
-    #   digitalmarketplace-apiclient
     #   mailchimp3
     #   notifications-python-client
-s3transfer==0.4.1
-    # via boto3
-six==1.15.0
+rpds-py==0.10.6
     # via
     #   jsonschema
+    #   referencing
+s3transfer==0.7.0
+    # via
+    #   -r requirements.txt
+    #   boto3
+six==1.16.0
+    # via
+    #   -r requirements.txt
     #   python-dateutil
 sortedcontainers==2.3.0
     # via hypothesis
-toml==0.10.2
+tomli==2.0.1
     # via pytest
 unicodecsv==0.14.1
-    # via ccs-digitalmarketplace-utils
+    # via
+    #   -r requirements.txt
+    #   ccs-digitalmarketplace-utils
 urllib3==1.26.18
     # via
+    #   -r requirements.txt
     #   botocore
     #   requests
 werkzeug==1.0.1
-    # via flask
+    # via
+    #   -r requirements.txt
+    #   flask
+    #   flask-login
 workdays==1.4
-    # via ccs-digitalmarketplace-utils
-wrapt==1.14.0
-    # via deprecated
-wtforms==2.3.3
-    # via flask-wtf
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools
+    # via
+    #   -r requirements.txt
+    #   ccs-digitalmarketplace-utils
+wtforms==3.1.0
+    # via
+    #   -r requirements.txt
+    #   flask-wtf
+zipp==3.17.0
+    # via
+    #   -r requirements.txt
+    #   importlib-metadata