ccs-digitalmarketplace-frameworks 1.3.43 → 1.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/SECURITY.md +7 -0
- package/frameworks/digital-outcomes-6/messages/urls.yml +1 -2
- package/frameworks/g-cloud-13/questions/declaration/employersInsurance.yml +2 -1
- package/frameworks/g-cloud-13/questions/declaration/servicesHaveOrSupportCloudSupport.yml +1 -1
- package/frameworks/g-cloud-13/questions/declaration/termsAndConditions.yml +1 -1
- package/frameworks/g-cloud-13/questions/declaration/termsOfParticipation.yml +1 -1
- package/frameworks/g-cloud-13/questions/declaration/understandHowToAskQuestions.yml +1 -1
- package/frameworks/g-cloud-13/questions/services/energyEfficientDatacentres.yml +1 -1
- package/frameworks/g-cloud-13/questions/services/webInterfaceAccessibilityDescription.yml +1 -1
- package/package.json +1 -1
- package/requirements-dev.txt +31 -26
- package/requirements.txt +3 -3
- package/tests/test_content.py +1 -1
package/SECURITY.md
ADDED
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
Contact: cybersecurity@crowncommercial.gov.uk
|
|
2
|
+
|
|
3
|
+
Policy: https://www.crowncommercial.gov.uk/vulnerability-disclosure-policy
|
|
4
|
+
|
|
5
|
+
Acknowledgements: https://www.crowncommercial.gov.uk/vulnerability-disclosure-policy/acknowledgements
|
|
6
|
+
|
|
7
|
+
Encryption: https://github.com/Crown-Commercial-Service/ccs-vulnerability-disclosure-policy/blob/main/vulnerability-disclosure-public-encryption.pub
|
|
@@ -1,4 +1,3 @@
|
|
|
1
1
|
call_off_contract_url: https://www.gov.uk/guidance/digital-outcomes-and-specialists-6-legal-documents/__placeholder__
|
|
2
|
-
|
|
3
|
-
framework_agreement_url: https://www.gov.uk/guidance/digital-outcomes-and-specialists-6-legal-documents/__placeholder__
|
|
2
|
+
framework_agreement_url: https://www.crowncommercial.gov.uk/digital-outcomes-6-contract-terms-and-conditions/
|
|
4
3
|
supplier_guide_url: https://www.gov.uk/guidance/how-to-apply-to-sell-on-the-digital-outcomes-framework
|
|
@@ -7,7 +7,8 @@ hint: >
|
|
|
7
7
|
members. You must answer ‘Yes’ or ‘Not applicable’ to be eligible for consideration for the G-Cloud 13 framework.
|
|
8
8
|
type: radios
|
|
9
9
|
options:
|
|
10
|
-
- label: "Yes
|
|
10
|
+
- label: "Yes - your organisation has, or will have in place, employer’s liability insurance of at least £5 million before the framework is awarded."
|
|
11
|
+
value: "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."
|
|
11
12
|
- 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."
|
|
12
13
|
- 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."
|
|
13
14
|
assessment:
|
|
@@ -3,7 +3,7 @@ question: >
|
|
|
3
3
|
If you're submitting a cloud support (lot 3) service, does your service both:
|
|
4
4
|
|
|
5
5
|
- enable the delivery of cloud services
|
|
6
|
-
- comply with the <a href="https://www.contractsfinder.service.gov.uk/Notice/
|
|
6
|
+
- comply with the <a href="https://www.contractsfinder.service.gov.uk/Notice/52e2fd33-e6f3-4a4c-8697-d25ab76ea0a9" target="_blank" rel="noopener noreferrer">definition of cloud support in the framework agreement</a>
|
|
7
7
|
|
|
8
8
|
type: radios
|
|
9
9
|
options:
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
name: Terms and conditions
|
|
2
2
|
question: >
|
|
3
|
-
Do you accept the terms and conditions in the <a href="https://www.contractsfinder.service.gov.uk/Notice/
|
|
3
|
+
Do you accept the terms and conditions in the <a href="https://www.contractsfinder.service.gov.uk/Notice/52e2fd33-e6f3-4a4c-8697-d25ab76ea0a9" target="_blank" rel="noopener noreferrer">framework agreement and call-off contract documents (link opens in a new tab)</a>?
|
|
4
4
|
type: boolean
|
|
5
5
|
assessment:
|
|
6
6
|
passIfIn:
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
name: Invitation to tender
|
|
2
2
|
question: >
|
|
3
|
-
Do you agree to comply with the terms of the <a href="https://www.contractsfinder.service.gov.uk/Notice/
|
|
3
|
+
Do you agree to comply with the terms of the <a href="https://www.contractsfinder.service.gov.uk/Notice/52e2fd33-e6f3-4a4c-8697-d25ab76ea0a9" target="_blank" rel="noopener noreferrer">G-Cloud 13 ‘invitation to tender’ (link opens in a new tab)</a>?
|
|
4
4
|
type: boolean
|
|
5
5
|
assessment:
|
|
6
6
|
passIfIn:
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
name: Asking questions
|
|
2
2
|
question: >
|
|
3
|
-
Do you understand that you can ask ‘clarification’ questions on the <a href="https://www.digitalmarketplace.service.gov.uk/suppliers/frameworks/g-cloud-13/updates" target="_blank" rel="noopener noreferrer">G-Cloud 13 updates page (link opens in a new tab)</a> in your Digital Marketplace account?
|
|
3
|
+
Do you understand that you can ask ‘clarification’ questions on the <a href="https://www.applytosupply.digitalmarketplace.service.gov.uk/suppliers/frameworks/g-cloud-13/updates" target="_blank" rel="noopener noreferrer">G-Cloud 13 updates page (link opens in a new tab)</a> in your Digital Marketplace account?
|
|
4
4
|
hint: >
|
|
5
5
|
You can ask clarification questions about G-Cloud 13 until 3pm BST 14 April 2022. All questions and answers will be posted regularly on the G-Cloud 13 updates page. You will be notified by email when new clarification questions and answers are available.
|
|
6
6
|
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
name: Energy-efficient datacentres
|
|
2
2
|
question: Do your datacentres adhere to the EU code of conduct for energy-efficient datacentres?
|
|
3
3
|
question_advice: >
|
|
4
|
-
Read about the <a href="https://ec.europa.eu/
|
|
4
|
+
Read about the <a href="https://joint-research-centre.ec.europa.eu/energy-efficiency/energy-efficiency-products/code-conduct-ict/code-conduct-energy-efficiency-data-centres_en" target="_blank" rel="noopener noreferrer">EU code of conduct for energy-efficient datacentres (link opens in a new tab)</a>.
|
|
5
5
|
|
|
6
6
|
depends:
|
|
7
7
|
- "on": lot
|
|
@@ -2,7 +2,7 @@ name: How the web interface is accessible
|
|
|
2
2
|
question: Describe how your web interface is accessible.
|
|
3
3
|
question_advice: >
|
|
4
4
|
Include details of what users can and can’t do.
|
|
5
|
-
<a href="
|
|
5
|
+
<a href="https://www.etsi.org/deliver/etsi_en/301500_301599/301549/03.02.01_60/en_301549v030201p.pdf" target="_blank" rel="noopener noreferrer">EN 301 549 9: Web (link opens in a new tab)</a> includes the features and
|
|
6
6
|
constraints you should describe.
|
|
7
7
|
|
|
8
8
|
hidden: true
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ccs-digitalmarketplace-frameworks",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.4.0",
|
|
4
4
|
"description": "Data files for Digital Marketplace’s procurement frameworks",
|
|
5
5
|
"repository": "git@github.com:Brickendon-DMp1-5/digitalmarketplace-frameworks",
|
|
6
6
|
"author": "enquiries@digitalmarketplace.service.gov.uk"
|
package/requirements-dev.txt
CHANGED
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
#
|
|
2
|
-
# This file is autogenerated by pip-compile
|
|
2
|
+
# This file is autogenerated by pip-compile with python 3.9
|
|
3
3
|
# To update, run:
|
|
4
4
|
#
|
|
5
5
|
# pip-compile requirements-dev.in
|
|
6
6
|
#
|
|
7
|
-
asn1crypto==1.4.0
|
|
8
|
-
# via cryptography
|
|
9
7
|
attrs==20.3.0
|
|
10
8
|
# via
|
|
11
9
|
# hypothesis
|
|
@@ -19,6 +17,8 @@ botocore==1.20.55
|
|
|
19
17
|
# via
|
|
20
18
|
# boto3
|
|
21
19
|
# s3transfer
|
|
20
|
+
cachelib==0.6.0
|
|
21
|
+
# via flask-session
|
|
22
22
|
certifi==2020.12.5
|
|
23
23
|
# via requests
|
|
24
24
|
cffi==1.14.5
|
|
@@ -29,15 +29,19 @@ click==7.1.2
|
|
|
29
29
|
# via flask
|
|
30
30
|
contextlib2==0.6.0.post1
|
|
31
31
|
# via digitalmarketplace-utils
|
|
32
|
-
cryptography==
|
|
32
|
+
cryptography==36.0.1
|
|
33
33
|
# via digitalmarketplace-utils
|
|
34
34
|
deepmerge==1.0.1
|
|
35
|
-
# via
|
|
35
|
+
# via
|
|
36
|
+
# -r requirements-dev.in
|
|
37
|
+
# -r requirements.txt
|
|
36
38
|
defusedxml==0.7.1
|
|
37
39
|
# via odfpy
|
|
38
|
-
|
|
40
|
+
deprecated==1.2.13
|
|
41
|
+
# via redis
|
|
42
|
+
digitalmarketplace-content-loader==9.1.0
|
|
39
43
|
# via -r requirements.txt
|
|
40
|
-
|
|
44
|
+
digitalmarketplace-utils==60.7.1
|
|
41
45
|
# via
|
|
42
46
|
# -r requirements.txt
|
|
43
47
|
# digitalmarketplace-content-loader
|
|
@@ -47,23 +51,23 @@ docopt==0.6.2
|
|
|
47
51
|
# notifications-python-client
|
|
48
52
|
flake8==3.9.1
|
|
49
53
|
# via -r requirements-dev.in
|
|
50
|
-
flask-gzip==0.2
|
|
51
|
-
# via digitalmarketplace-utils
|
|
52
|
-
flask-login==0.5.0
|
|
53
|
-
# via digitalmarketplace-utils
|
|
54
|
-
flask-script==2.0.6
|
|
55
|
-
# via digitalmarketplace-utils
|
|
56
|
-
flask-wtf==0.14.3
|
|
57
|
-
# via digitalmarketplace-utils
|
|
58
54
|
flask==1.0.4
|
|
59
55
|
# via
|
|
60
56
|
# digitalmarketplace-content-loader
|
|
61
57
|
# digitalmarketplace-utils
|
|
62
58
|
# flask-gzip
|
|
63
59
|
# flask-login
|
|
64
|
-
# flask-
|
|
60
|
+
# flask-session
|
|
65
61
|
# flask-wtf
|
|
66
62
|
# gds-metrics
|
|
63
|
+
flask-gzip==0.2
|
|
64
|
+
# via digitalmarketplace-utils
|
|
65
|
+
flask-login==0.5.0
|
|
66
|
+
# via digitalmarketplace-utils
|
|
67
|
+
flask-session==0.4.0
|
|
68
|
+
# via digitalmarketplace-utils
|
|
69
|
+
flask-wtf==0.14.3
|
|
70
|
+
# via digitalmarketplace-utils
|
|
67
71
|
fleep==1.0.1
|
|
68
72
|
# via digitalmarketplace-utils
|
|
69
73
|
future==0.18.2
|
|
@@ -75,9 +79,7 @@ govuk-country-register==0.5.0
|
|
|
75
79
|
hypothesis==6.10.0
|
|
76
80
|
# via -r requirements-dev.in
|
|
77
81
|
idna==2.10
|
|
78
|
-
# via
|
|
79
|
-
# cryptography
|
|
80
|
-
# requests
|
|
82
|
+
# via requests
|
|
81
83
|
inflection==0.5.1
|
|
82
84
|
# via digitalmarketplace-content-loader
|
|
83
85
|
iniconfig==1.1.1
|
|
@@ -96,7 +98,7 @@ jmespath==0.10.0
|
|
|
96
98
|
# botocore
|
|
97
99
|
jsonschema==3.2.0
|
|
98
100
|
# via -r requirements-dev.in
|
|
99
|
-
mailchimp3==3.0.
|
|
101
|
+
mailchimp3==3.0.17
|
|
100
102
|
# via digitalmarketplace-utils
|
|
101
103
|
markdown==2.6.11
|
|
102
104
|
# via digitalmarketplace-content-loader
|
|
@@ -115,7 +117,9 @@ notifications-python-client==5.7.1
|
|
|
115
117
|
odfpy==1.4.1
|
|
116
118
|
# via digitalmarketplace-utils
|
|
117
119
|
packaging==20.9
|
|
118
|
-
# via
|
|
120
|
+
# via
|
|
121
|
+
# pytest
|
|
122
|
+
# redis
|
|
119
123
|
pluggy==0.13.1
|
|
120
124
|
# via pytest
|
|
121
125
|
prometheus-client==0.10.1
|
|
@@ -138,7 +142,7 @@ pytest==6.2.3
|
|
|
138
142
|
# via -r requirements-dev.in
|
|
139
143
|
python-dateutil==2.8.1
|
|
140
144
|
# via botocore
|
|
141
|
-
|
|
145
|
+
python-json-logger==v0.1.11
|
|
142
146
|
# via
|
|
143
147
|
# -r requirements.txt
|
|
144
148
|
# digitalmarketplace-utils
|
|
@@ -148,6 +152,8 @@ pyyaml==5.4.1
|
|
|
148
152
|
# via
|
|
149
153
|
# -r requirements-dev.in
|
|
150
154
|
# digitalmarketplace-content-loader
|
|
155
|
+
redis==4.1.4
|
|
156
|
+
# via digitalmarketplace-utils
|
|
151
157
|
requests==2.25.1
|
|
152
158
|
# via
|
|
153
159
|
# digitalmarketplace-utils
|
|
@@ -157,7 +163,6 @@ s3transfer==0.4.1
|
|
|
157
163
|
# via boto3
|
|
158
164
|
six==1.15.0
|
|
159
165
|
# via
|
|
160
|
-
# cryptography
|
|
161
166
|
# jsonschema
|
|
162
167
|
# python-dateutil
|
|
163
168
|
sortedcontainers==2.3.0
|
|
@@ -171,11 +176,11 @@ urllib3==1.26.5
|
|
|
171
176
|
# botocore
|
|
172
177
|
# requests
|
|
173
178
|
werkzeug==1.0.1
|
|
174
|
-
# via
|
|
175
|
-
# digitalmarketplace-utils
|
|
176
|
-
# flask
|
|
179
|
+
# via flask
|
|
177
180
|
workdays==1.4
|
|
178
181
|
# via digitalmarketplace-utils
|
|
182
|
+
wrapt==1.14.0
|
|
183
|
+
# via deprecated
|
|
179
184
|
wtforms==2.3.3
|
|
180
185
|
# via flask-wtf
|
|
181
186
|
|
package/requirements.txt
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
docopt==0.6.2
|
|
2
2
|
deepmerge==1.0.1
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
3
|
+
python-json-logger==0.1.11
|
|
4
|
+
digitalmarketplace-content-loader==9.1.0
|
|
5
|
+
digitalmarketplace-utils==60.7.1
|
package/tests/test_content.py
CHANGED
|
@@ -37,7 +37,7 @@ MANIFEST_QUESTION_SET = {
|
|
|
37
37
|
# `item` property wouldn't usually be part of a brief response but is included here as the dynamic list child question
|
|
38
38
|
# `evidence` relies on an `item` in its context to render
|
|
39
39
|
QUESTION_SET_CONTEXT = {
|
|
40
|
-
'briefs': {'lot': 'context-lot'},
|
|
40
|
+
'briefs': {'lot': 'context-lot', 'lotSlug': 'context-lot-slug'},
|
|
41
41
|
'brief-responses': {
|
|
42
42
|
'lot': 'context-lot',
|
|
43
43
|
'brief': mock.MagicMock(),
|