ccs-digitalmarketplace-frameworks 4.1.5 → 4.2.0

package/frameworks/digital-outcomes-and-specialists-7/questions/services/multiqTechnicalAbilityCertificates.yml

@@ -1,7 +1,7 @@
 name: Technical ability certificates
 question: |
   <p class="govuk-body">You are required to submit a maximum of 2 certificates to demonstrate that you have delivered the services within the scope of Lot 2 Digital Capability and Delivery Partner.</p>
-  <p class="govuk-body govuk-!-margin-top-3">You can download a blank certificate template from XXXX (url link). No amendments are permitted to the format or structure of the certificate.</p>
+  <p class="govuk-body govuk-!-margin-top-3">You can download a blank certificate template from XXXX (URL link). No amendments are permitted to the format or structure of the certificate.</p>
   <p class="govuk-body govuk-!-margin-top-3">You must submit each certificate as a separate file. Zip files will not be accepted.</p>
   <p class="govuk-body govuk-!-margin-top-3">Each certificate submitted will be assessed as Pass / Fail.</p>
   <p class="govuk-body govuk-!-margin-top-3">Certificates must be signed off by the customer and you the bidder.</p>
@@ -13,7 +13,7 @@ question: |
     <li>Please upload your second certificate (if required) as part of your tender submission. (optional)</li>
   </ul>
 question_advice:
-  Please upload certificate in Open Document Format (ODF) or PDF/A (eg .pdf, .odt). (Maximum file size 5MB).
+  Please upload certificate in Open Document Format (ODF) or PDF/A (e.g., .pdf, .odt). (Maximum file size 5MB).
 
 type: multiquestion
 

package/frameworks/digital-outcomes-and-specialists-7/questions/services/technicalAbilityCertificateOneURL.yml

@@ -21,4 +21,4 @@ validations:
   - name: file_can_be_saved
     message: The selected file could not be uploaded - try again
   - name: file_is_open_document_format
-    message: Please upload a document in the valid format like pdf
+    message: Please upload a document in the valid format like PDF

package/frameworks/digital-outcomes-and-specialists-7/questions/services/technicalAbilityCertificateTwoURL.yml

@@ -20,4 +20,4 @@ validations:
   - name: file_can_be_saved
     message: The selected file could not be uploaded - try again
   - name: file_is_open_document_format
-    message: Please upload a document in the valid format like pdf
+    message: Please upload a document in the valid format like PDF

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

@@ -21,6 +21,11 @@ depends:
 
 type: upload
 
+file_settings:
+  name: pricing-document
+  max_size: 5
+  file_type: open_document
+
 validations:
   - name: answer_required
     message: Select a file.

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

@@ -22,6 +22,11 @@ depends:
 
 type: upload
 
+file_settings:
+  name: service-definition-document
+  max_size: 5
+  file_type: open_document
+
 validations:
   - name: answer_required
     message: Select a file.

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

@@ -22,6 +22,11 @@ depends:
 
 type: upload
 
+file_settings:
+  name: sfia-rate-card
+  max_size: 5
+  file_type: open_document
+
 validations:
   - name: file_is_open_document_format
     message: The file must be in an open format. Select an Open Document Format (ODF) or PDF/A (eg .pdf, .odt).

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

@@ -21,6 +21,11 @@ depends:
 
 type: upload
 
+file_settings:
+  name: terms-and-conditions
+  max_size: 5
+  file_type: open_document
+
 validations:
   - name: answer_required
     message: Select a file.

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

@@ -21,6 +21,11 @@ depends:
 
 type: upload
 
+file_settings:
+  name: pricing-document
+  max_size: 5
+  file_type: open_document
+
 validations:
   - name: answer_required
     message: Select a file.

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

@@ -23,6 +23,11 @@ depends:
 
 type: upload
 
+file_settings:
+  name: service-definition-document
+  max_size: 5
+  file_type: open_document
+
 validations:
   - name: answer_required
     message: Select a file.

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

@@ -22,6 +22,11 @@ depends:
 
 type: upload
 
+file_settings:
+  name: sfia-rate-card
+  max_size: 5
+  file_type: open_document
+
 validations:
   - name: file_is_open_document_format
     message: The file must be in an open format. Select an Open Document Format (ODF) or PDF/A (eg .pdf, .odt).

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

@@ -21,6 +21,11 @@ depends:
 
 type: upload
 
+file_settings:
+  name: terms-and-conditions
+  max_size: 5
+  file_type: open_document
+
 validations:
   - name: answer_required
     message: Select a file.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccs-digitalmarketplace-frameworks",
-  "version": "4.1.5",
+  "version": "4.2.0",
   "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/pyproject.toml

@@ -0,0 +1,45 @@
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "ccs-digitalmarketplace-frameworks"
+version = "0.0.0"
+dependencies = [
+  'docopt==0.6.2',
+  'deepmerge==2.0',
+  'python-json-logger==2.0.7',
+  'ccs-digitalmarketplace-content-loader==13.6.0',
+  'ccs-digitalmarketplace-utils==69.0.0',
+]
+requires-python = ">=3.11,<3.12"
+authors = [
+  {name = "CCS Developers"},
+]
+description = "Digital Marketplace Frameworks"
+readme = "README.md"
+license-files = ["LICEN[CS]E*"]
+
+[project.urls]
+Homepage = "https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frameworks"
+Repository = "https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frameworks.git"
+Issues = "https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frameworks/issues"
+Changelog = "https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frameworks/CHANGELOG.md"
+
+[project.optional-dependencies]
+dev = [
+  'flake8',
+  'hypothesis',
+  'jsonschema',
+  'deepmerge',
+  'pytest',
+  'PyYAML',
+  'pre-commit',
+]
+
+[tool.setuptools]
+py-modules = []
+
+[tool.pytest.ini_options]
+testpaths = "tests"
+norecursedirs = "venv*"

package/requirements-dev.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
-#    pip-compile requirements-dev.in
+#    pip-compile --constraint=requirements.txt --extra=dev --output-file=requirements-dev.txt pyproject.toml
 #
 attrs==23.1.0
     # via
@@ -11,78 +11,82 @@ attrs==23.1.0
     #   referencing
 blinker==1.8.2
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   flask
 boto3==1.34.144
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   ccs-digitalmarketplace-utils
 botocore==1.34.144
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   boto3
     #   s3transfer
 cachelib==0.13.0
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   flask-session
 ccs-digitalmarketplace-apiclient==28.0.0
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   ccs-digitalmarketplace-utils
 ccs-digitalmarketplace-content-loader==13.6.0
-    # via -r requirements.txt
+    # via
+    #   -c requirements.txt
+    #   ccs-digitalmarketplace-frameworks (pyproject.toml)
 ccs-digitalmarketplace-utils==69.0.0
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   ccs-digitalmarketplace-content-loader
+    #   ccs-digitalmarketplace-frameworks (pyproject.toml)
 certifi==2024.7.4
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   requests
 cffi==1.16.0
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   cryptography
 cfgv==3.4.0
     # via pre-commit
 charset-normalizer==3.3.2
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   requests
 click==8.1.7
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   flask
 contextlib2==21.6.0
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   ccs-digitalmarketplace-utils
 cryptography==44.0.1
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   ccs-digitalmarketplace-utils
 deepmerge==2.0
     # via
-    #   -r requirements-dev.in
-    #   -r requirements.txt
+    #   -c requirements.txt
+    #   ccs-digitalmarketplace-frameworks (pyproject.toml)
 defusedxml==0.7.1
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   odfpy
 distlib==0.3.9
     # via virtualenv
 docopt==0.6.2
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
+    #   ccs-digitalmarketplace-frameworks (pyproject.toml)
     #   notifications-python-client
 filelock==3.17.0
     # via virtualenv
 flake8==7.2.0
-    # via -r requirements-dev.in
+    # via ccs-digitalmarketplace-frameworks (pyproject.toml)
 flask==3.0.3
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   ccs-digitalmarketplace-apiclient
     #   ccs-digitalmarketplace-content-loader
     #   ccs-digitalmarketplace-utils
@@ -92,71 +96,71 @@ flask==3.0.3
     #   flask-wtf
 flask-gzip==0.2
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   ccs-digitalmarketplace-utils
 flask-login==0.6.3
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   ccs-digitalmarketplace-utils
 flask-session==0.6.0
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   ccs-digitalmarketplace-utils
 flask-wtf==1.2.1
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   ccs-digitalmarketplace-utils
 fleep==1.0.1
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   ccs-digitalmarketplace-utils
 govuk-country-register==0.5.0
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   ccs-digitalmarketplace-utils
 hypothesis==6.130.9
-    # via -r requirements-dev.in
+    # via ccs-digitalmarketplace-frameworks (pyproject.toml)
 identify==2.6.8
     # via pre-commit
 idna==3.7
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   requests
 inflection==0.5.1
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   ccs-digitalmarketplace-content-loader
 iniconfig==1.1.1
     # via pytest
 itsdangerous==2.2.0
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   flask
     #   flask-wtf
 jinja2==3.1.6
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   flask
 jmespath==1.0.1
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   boto3
     #   botocore
 jsonschema==4.23.0
-    # via -r requirements-dev.in
+    # via ccs-digitalmarketplace-frameworks (pyproject.toml)
 jsonschema-specifications==2023.7.1
     # via jsonschema
 mailchimp3==3.0.21
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   ccs-digitalmarketplace-utils
 markdown==3.6
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   ccs-digitalmarketplace-content-loader
 markupsafe==2.1.5
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   jinja2
     #   werkzeug
     #   wtforms
@@ -166,57 +170,56 @@ nodeenv==1.9.1
     # via pre-commit
 notifications-python-client==8.2.0
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   ccs-digitalmarketplace-utils
 odfpy==1.4.1
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   ccs-digitalmarketplace-utils
-packaging==20.9
+packaging==24.2
     # via pytest
 platformdirs==4.3.6
     # via virtualenv
 pluggy==1.5.0
     # via pytest
 pre-commit==4.2.0
-    # via -r requirements-dev.in
+    # via ccs-digitalmarketplace-frameworks (pyproject.toml)
 pycodestyle==2.13.0
     # via flake8
 pycparser==2.22
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   cffi
 pyflakes==3.3.1
     # via flake8
 pyjwt==2.8.0
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   notifications-python-client
-pyparsing==2.4.7
-    # via packaging
 pytest==8.3.5
-    # via -r requirements-dev.in
+    # via ccs-digitalmarketplace-frameworks (pyproject.toml)
 python-dateutil==2.9.0.post0
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   botocore
 python-json-logger==2.0.7
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
+    #   ccs-digitalmarketplace-frameworks (pyproject.toml)
     #   ccs-digitalmarketplace-utils
 pytz==2024.1
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   ccs-digitalmarketplace-utils
 pyyaml==6.0.2
     # via
-    #   -r requirements-dev.in
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   ccs-digitalmarketplace-content-loader
+    #   ccs-digitalmarketplace-frameworks (pyproject.toml)
     #   pre-commit
 redis==5.0.7
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   ccs-digitalmarketplace-utils
 referencing==0.30.2
     # via
@@ -224,7 +227,7 @@ referencing==0.30.2
     #   jsonschema-specifications
 requests==2.32.3
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   ccs-digitalmarketplace-apiclient
     #   ccs-digitalmarketplace-utils
     #   mailchimp3
@@ -235,21 +238,21 @@ rpds-py==0.10.6
     #   referencing
 s3transfer==0.10.2
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   boto3
 six==1.16.0
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   python-dateutil
 sortedcontainers==2.3.0
     # via hypothesis
 unicodecsv==0.14.1
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   ccs-digitalmarketplace-utils
 urllib3==2.2.2
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   botocore
     #   ccs-digitalmarketplace-utils
     #   requests
@@ -257,15 +260,15 @@ virtualenv==20.29.2
     # via pre-commit
 werkzeug==3.0.6
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   ccs-digitalmarketplace-utils
     #   flask
     #   flask-login
 workdays==1.4
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   ccs-digitalmarketplace-utils
 wtforms==3.1.2
     # via
-    #   -r requirements.txt
+    #   -c requirements.txt
     #   flask-wtf

package/requirements.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
-#    pip-compile requirements.in
+#    pip-compile pyproject.toml
 #
 blinker==1.8.2
     # via flask
@@ -17,11 +17,11 @@ cachelib==0.13.0
 ccs-digitalmarketplace-apiclient==28.0.0
     # via ccs-digitalmarketplace-utils
 ccs-digitalmarketplace-content-loader==13.6.0
-    # via -r requirements.in
+    # via ccs-digitalmarketplace-frameworks (pyproject.toml)
 ccs-digitalmarketplace-utils==69.0.0
     # via
-    #   -r requirements.in
     #   ccs-digitalmarketplace-content-loader
+    #   ccs-digitalmarketplace-frameworks (pyproject.toml)
 certifi==2024.7.4
     # via requests
 cffi==1.16.0
@@ -35,12 +35,12 @@ contextlib2==21.6.0
 cryptography==44.0.1
     # via ccs-digitalmarketplace-utils
 deepmerge==2.0
-    # via -r requirements.in
+    # via ccs-digitalmarketplace-frameworks (pyproject.toml)
 defusedxml==0.7.1
     # via odfpy
 docopt==0.6.2
     # via
-    #   -r requirements.in
+    #   ccs-digitalmarketplace-frameworks (pyproject.toml)
     #   notifications-python-client
 flask==3.0.3
     # via
@@ -98,7 +98,7 @@ python-dateutil==2.9.0.post0
     # via botocore
 python-json-logger==2.0.7
     # via
-    #   -r requirements.in
+    #   ccs-digitalmarketplace-frameworks (pyproject.toml)
     #   ccs-digitalmarketplace-utils
 pytz==2024.1
     # via ccs-digitalmarketplace-utils

package/requirements-dev.in

@@ -1,9 +0,0 @@
--r requirements.txt
-
-flake8
-hypothesis
-jsonschema
-deepmerge
-pytest
-PyYAML
-pre-commit

package/requirements.in

@@ -1,5 +0,0 @@
-docopt==0.6.2
-deepmerge==2.0
-python-json-logger==2.0.7
-ccs-digitalmarketplace-content-loader==13.6.0
-ccs-digitalmarketplace-utils==69.0.0

package/setup.cfg

@@ -1,2 +0,0 @@
-[tool:pytest]
-norecursedirs = venv*

package/tag_version.sh

@@ -1,13 +0,0 @@
-#!/bin/sh
-set -e
-echo "≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡"
-echo "TAGGING LATEST VERSION"
-echo "--------------------------------------------------------------------------------"
-git checkout main
-git pull origin main
-version=v$(jq -r ".version" package.json)
-echo Version:\ \ $version
-echo "================================================================================"
-git tag -a $version -m "Release version $version"
-echo "New tag created!"
-echo "--------------------------------------------------------------------------------"