ccs-digitalmarketplace-frameworks 1.8.30 → 1.8.32

package/.github/workflows/test.yml

@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -45,7 +45,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 

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

@@ -116,6 +116,7 @@
     - independenceOfResources
     - usageNotifications
     - usageNotificationsHow
+    - usageNotificationsHowOther
 
 - name: Analytics
   questions:

package/frameworks/g-cloud-14/questions/declaration/authOrgLegalRequirementCompliant.yml

@@ -1,4 +1,4 @@
-name: Confirm you are complient
+name: Confirm you are compliant
 question: Please provide confirmation that you comply with what is required
 type: boolean
 hidden: true

package/frameworks/g-cloud-14/questions/declaration/immediateParentCompanyDetailsVATNumber.yml

@@ -1,5 +1,6 @@
 name: VAT number
 question: VAT number
+hint: This is 9 or 12 numbers, sometimes with ‘GB’ at the start, like 123456789 or GB123456789
 type: text
 optional: true
 

package/frameworks/g-cloud-14/questions/declaration/mandatoryExclusionTaxes.yml

@@ -1,4 +1,4 @@
-name: Taxes and social security contributions.
+name: Taxes and social security contributions
 question: Please confirm that you have met all your obligations relating to the payment of taxes and social security contributions, both in the country in which you are established and in the UK.
 question_advice: |
   The detailed grounds for mandatory and discretionary exclusion of a supplier for non-payment of taxes and social security contributions, are set out on the

package/frameworks/g-cloud-14/questions/declaration/{modernSlaveryComplient.yml → modernSlaveryCompliant.yml}

@@ -1,4 +1,4 @@
-name: Modern slavery - Are you complient
+name: Modern slavery - Are you compliant
 question: Are you compliant with the annual reporting requirements contained within <a class="govuk-link" href="http://www.legislation.gov.uk/ukpga/2015/30/section/54/enacted" target="_blank" rel="noopener noreferrer">Section 54 of the Act 2015 (opens in new tab)</a>?
 
 type: boolean

package/frameworks/g-cloud-14/questions/declaration/multiqModernSlaveryRelevant.yml

@@ -4,7 +4,7 @@ type: multiquestion
 hidden: true
 
 questions:
-  - modernSlaveryComplient
+  - modernSlaveryCompliant
   - modernSlaveryElectronicAvailable
   - modernSlaveryElectronicWebAddress
   - modernSlaveryElectronicReference

package/frameworks/g-cloud-14/questions/declaration/pscDetails1Conditions.yml

@@ -2,9 +2,9 @@ name: Conditions for being a PSC
 question: Which conditions for being a PSC are met?
 type: radios
 options:
-  - label: "Over 25% up to (and including) 50%"
+  - label: "25% or more and less than 50%"
     value: "more than 25%"
-  - label: "More than 50% and less than 75%"
+  - label: "50% or more and less than 75%"
     value: "more than 50%"
   - label: "75% or more"
     value: "more than 75%"

package/frameworks/g-cloud-14/questions/declaration/pscDetails2Conditions.yml

@@ -2,9 +2,9 @@ name: Conditions for being a PSC
 question: Which conditions for being a PSC are met?
 type: radios
 options:
-  - label: "Over 25% up to (and including) 50%"
+  - label: "25% or more and less than 50%"
     value: "more than 25%"
-  - label: "More than 50% and less than 75%"
+  - label: "50% or more and less than 75%"
     value: "more than 50%"
   - label: "75% or more"
     value: "more than 75%"

package/frameworks/g-cloud-14/questions/declaration/pscDetails3Conditions.yml

@@ -2,9 +2,9 @@ name: Conditions for being a PSC
 question: Which conditions for being a PSC are met?
 type: radios
 options:
-  - label: "Over 25% up to (and including) 50%"
+  - label: "25% or more and less than 50%"
     value: "more than 25%"
-  - label: "More than 50% and less than 75%"
+  - label: "50% or more and less than 75%"
     value: "more than 50%"
   - label: "75% or more"
     value: "more than 75%"

package/frameworks/g-cloud-14/questions/declaration/pscDetails4Conditions.yml

@@ -2,9 +2,9 @@ name: Conditions for being a PSC
 question: Which conditions for being a PSC are met?
 type: radios
 options:
-  - label: "Over 25% up to (and including) 50%"
+  - label: "25% or more and less than 50%"
     value: "more than 25%"
-  - label: "More than 50% and less than 75%"
+  - label: "50% or more and less than 75%"
     value: "more than 50%"
   - label: "75% or more"
     value: "more than 75%"

package/frameworks/g-cloud-14/questions/declaration/ultimateParentCompanyDetailsVATNumber.yml

@@ -1,5 +1,6 @@
 name: VAT number
 question: VAT number
+hint: This is 9 or 12 numbers, sometimes with ‘GB’ at the start, like 123456789 or GB123456789
 type: text
 optional: true
 

package/frameworks/g-cloud-14/questions/declaration/vatNumber.yml

@@ -1,6 +1,7 @@
 name: Registered VAT number
 question: What is your registered VAT number?
-hint: You can view <a class="govuk-link" href="https://www.gov.uk/register-for-vat" for guidance" target="_blank" rel="noopener noreferrer">Register for VAT (opens in new tab)</a> for guidance
+question_advice: You can view <a class="govuk-link" href="https://www.gov.uk/register-for-vat" for guidance" target="_blank" rel="noopener noreferrer">Register for VAT (opens in new tab)</a> for guidance
+hint: This is 9 or 12 numbers, sometimes with ‘GB’ at the start, like 123456789 or GB123456789
 
 type: text
 

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

@@ -1,6 +1,6 @@
 name: Covid-19 recovery
 question: Covid-19 recovery
-
+hint: Your answer must be at least 10 words
 depends:
   - "on": lot
     being:
@@ -10,6 +10,7 @@ depends:
 
 type: textbox_large
 max_length_in_words: 300
+min_length_in_words: 10
 hidden: true
 
 validations:
@@ -19,3 +20,5 @@ validations:
     message: Your answer must be no more than 300 words
   - name: under_character_limit
     message: Description must be 3000 characters or fewer
+  - name: over_10_words
+    message: Your answer must be at least 10 words

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

@@ -1,6 +1,6 @@
 name: Equal opportunity
 question: Equal opportunity
-
+hint: Your answer must be at least 10 words
 depends:
   - "on": lot
     being:
@@ -10,6 +10,7 @@ depends:
 
 type: textbox_large
 max_length_in_words: 300
+min_length_in_words: 10
 hidden: true
 
 validations:
@@ -19,3 +20,5 @@ validations:
     message: Your answer must be no more than 300 words
   - name: under_character_limit
     message: Description must be 3000 characters or fewer
+  - name: over_10_words
+    message: Your answer must be at least 10 words

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

@@ -1,6 +1,6 @@
 name: Fighting climate change
 question: Fighting climate change
-
+hint: Your answer must be at least 10 words
 depends:
   - "on": lot
     being:
@@ -10,6 +10,7 @@ depends:
 
 type: textbox_large
 max_length_in_words: 300
+min_length_in_words: 10
 hidden: true
 
 validations:
@@ -19,3 +20,5 @@ validations:
     message: Your answer must be no more than 300 words
   - name: under_character_limit
     message: Description must be 3000 characters or fewer
+  - name: over_10_words
+    message: Your answer must be at least 10 words

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

@@ -10,3 +10,4 @@ type: multiquestion
 questions:
   - usageNotifications
   - usageNotificationsHow
+  - usageNotificationsHowOther

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

@@ -1,6 +1,6 @@
 name: Tackling economic inequality
 question: Tackling economic inequality
-
+hint: Your answer must be at least 10 words
 depends:
   - "on": lot
     being:
@@ -10,6 +10,7 @@ depends:
 
 type: textbox_large
 max_length_in_words: 300
+min_length_in_words: 10
 hidden: true
 
 validations:
@@ -19,3 +20,5 @@ validations:
     message: Your answer must be no more than 300 words
   - name: under_character_limit
     message: Description must be 3000 characters or fewer
+  - name: over_10_words
+    message: Your answer must be at least 10 words

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

@@ -6,6 +6,9 @@ depends:
   - "on": lot
     being:
       - cloud-hosting
+followup:
+  usageNotificationsHowOther:
+    - other
 
 type: checkboxes
 options:

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

@@ -0,0 +1,19 @@
+name: Other usage reporting
+question: Describe the other ways users are notified if usage nears service limits
+
+hidden: true
+depends:
+  - "on": lot
+    being:
+      - cloud-hosting
+
+type: textbox_large
+max_length_in_words: 200
+
+validations:
+  - name: answer_required
+    message: You need to answer this question because you selected ‘other’ for ‘How are users notified if usage nears service limits?’
+  - name: under_200_words
+    message: Your answer must be no more than 200 words
+  - name: under_character_limit
+    message: Your answer must be 2000 characters or fewer

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

@@ -1,6 +1,6 @@
 name: Wellbeing
 question: Wellbeing
-
+hint: Your answer must be at least 10 words
 depends:
   - "on": lot
     being:
@@ -10,6 +10,7 @@ depends:
 
 type: textbox_large
 max_length_in_words: 300
+min_length_in_words: 10
 hidden: true
 
 validations:
@@ -19,3 +20,5 @@ validations:
     message: Your answer must be no more than 300 words
   - name: under_character_limit
     message: Description must be 3000 characters or fewer
+  - name: over_10_words
+    message: Your answer must be at least 10 words

package/package.json

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

@@ -60,7 +60,7 @@ contextlib2==21.6.0
     # via
     #   -r requirements.txt
     #   ccs-digitalmarketplace-utils
-cryptography==41.0.5
+cryptography==41.0.6
     # via
     #   -r requirements.txt
     #   ccs-digitalmarketplace-utils
@@ -120,7 +120,7 @@ govuk-country-register==0.5.0
     # via
     #   -r requirements.txt
     #   ccs-digitalmarketplace-utils
-hypothesis==6.90.0
+hypothesis==6.92.0
     # via -r requirements-dev.in
 idna==3.4
     # via

package/requirements.txt

@@ -34,7 +34,7 @@ click==7.1.2
     # via flask
 contextlib2==21.6.0
     # via ccs-digitalmarketplace-utils
-cryptography==41.0.5
+cryptography==41.0.6
     # via ccs-digitalmarketplace-utils
 deepmerge==1.1.0
     # via -r requirements.in

package/schema_generator/validation.py

@@ -575,14 +575,21 @@ def parse_question_limits(question, for_items=False):
     Converts word and character length validators into JSON Schema-compatible maxLength and regex validators.
     """
     limits = {}
-    word_length_validator = next(
+    word_max_length_validator = next(
         iter(filter(None, (
             re.match(r'under_(\d+)_words', validator['name'])
             for validator in question.get('validations', [])
         ))),
         None
     )
-    char_length_validator = next(
+    word_min_length_validator = next(
+        iter(filter(None, (
+            re.match(r'over_(\d+)_words', validator['name'])
+            for validator in question.get('validations', [])
+        ))),
+        None
+    )
+    char_max_length_validator = next(
         iter(filter(None, (
             re.search(r'([\d,]+)', validator['message'])
             for validator in question.get('validations', [])
@@ -592,18 +599,27 @@ def parse_question_limits(question, for_items=False):
     )
 
     char_length = question.get('max_length') or (
-        char_length_validator and char_length_validator.group(1).replace(',', '')
+        char_max_length_validator and char_max_length_validator.group(1).replace(',', '')
+    )
+    word_max_length = (
+        question.get('max_length_in_words')
+        or (word_max_length_validator and word_max_length_validator.group(1))
     )
-    word_length = question.get('max_length_in_words') or (word_length_validator and word_length_validator.group(1))
 
     if char_length:
         limits['maxLength'] = int(char_length)
 
-    if word_length:
+    if word_max_length:
+        word_min_length = int(
+            question.get('min_length_in_words')
+            or (word_min_length_validator and word_min_length_validator.group(1))
+            or 1
+        ) - 1
+
         if not for_items and question.get('optional'):
-            limits['pattern'] = r"^$|(^(?:\S+\s+){0,%s}\S+$)" % (int(word_length) - 1)
+            limits['pattern'] = rf"^$|(^(?:\S+\s+){{{word_min_length},{int(word_max_length) - 1}}}\S+$)"
         else:
-            limits['pattern'] = r"^(?:\S+\s+){0,%s}\S+$" % (int(word_length) - 1)
+            limits['pattern'] = rf"^(?:\S+\s+){{{word_min_length},{int(word_max_length) - 1}}}\S+$"
 
     return limits
 

package/schemas/questions.json

@@ -160,6 +160,7 @@
               "not_a_number",
               "not_money_format",
               "not_required_value",
+              "over_10_words",
               "under_10_words",
               "under_20_words",
               "under_30_words",
@@ -249,6 +250,9 @@
     "decimal_place_restriction": {
       "type": "boolean"
     },
+    "min_length_in_words": {
+      "type": "integer"
+    },
     "max_length_in_words": {
       "type": "integer"
     },

package/tests/test_generate_validation_schema.py

@@ -146,11 +146,13 @@ def test_uri_property(id_name):
 def test_parse_question_limits_word_count(num):
     assume(not isnan(num))
 
-    question = {"validations": [
-        {
-            "name": "under_{0}_words".format(num)
-        }
-    ]}
+    question = {
+        "validations": [
+            {
+                "name": "under_{0}_words".format(num)
+            }
+        ]
+    }
     result = parse_question_limits(question)
     assert 'pattern' in result.keys()
     expected = '^(?:\\S+\\s+){0,' + str(num - 1) + '}\\S+$'
@@ -169,6 +171,39 @@ def test_parse_question_limits_word_count(num):
     assert m is None
 
 
+@given(st.integers(min_value=1, max_value=65534))
+def test_parse_question_requires_minimum_word_count(num):
+    assume(not isnan(num))
+
+    question = {
+        "validations": [
+            {
+                "name": "over_{0}_words".format(num),
+            },
+            {
+                "name": "under_{0}_words".format(num + 10)
+            }
+        ]
+    }
+    result = parse_question_limits(question)
+    assert 'pattern' in result.keys()
+    expected = '^(?:\\S+\\s+){' + str(num - 1) + ',' + str(num + 9) + '}\\S+$'
+    assert result['pattern'] == expected
+    matcher = re.compile(result['pattern'])
+
+    # Now test the regex works!
+    range_list = range(num)
+    generated_str = ' '.join(['a' for x in range_list])
+    m = re.search(matcher, generated_str)
+    assert m is not None
+
+    # now with one that's too short
+    range_list = range(num - 1)
+    generated_str = ' '.join(['a' for x in range_list])
+    m = re.search(matcher, generated_str)
+    assert m is None
+
+
 @given(st.integers(min_value=1, max_value=65534))
 def test_parse_question_limits_word_count_optional(num):
     assume(not isnan(num))
@@ -191,6 +226,31 @@ def test_parse_question_limits_word_count_optional(num):
     assert m is not None
 
 
+@given(st.integers(min_value=1, max_value=65534))
+def test_parse_question_requires_minimum_word_count_optional(num):
+    assume(not isnan(num))
+
+    question = {
+        "validations": [
+            {
+                "name": "over_{0}_words".format(num),
+            },
+            {
+                "name": "under_{0}_words".format(num + 10)
+            }
+        ],
+        "optional": True
+    }
+    result = parse_question_limits(question)
+    assert 'pattern' in result.keys()
+    assert result['pattern'].startswith("^$")
+
+    # test empty condition
+    matcher = re.compile(result['pattern'])
+    m = re.search(matcher, "")
+    assert m is not None
+
+
 @given(st.integers(min_value=1))
 def test_parse_question_limits_char_count(num):
     assume(not isnan(num))