ccs-digitalmarketplace-frameworks 1.4.2 → 1.6.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.
Files changed (8) hide show
  1. package/frameworks/g-cloud-12/manifests/services_search_filters.yml +0 -1
  2. package/frameworks/g-cloud-13/manifests/display_service.yml +1 -1
  3. package/frameworks/g-cloud-13/manifests/services_search_filters.yml +11 -27
  4. package/frameworks/g-cloud-13/messages/urls.yml +1 -1
  5. package/frameworks/g-cloud-13/search_mappings/services.json +20 -0
  6. package/package.json +1 -1
  7. package/requirements-dev.txt +35 -32
  8. package/requirements.txt +3 -3
package/frameworks/g-cloud-12/manifests/services_search_filters.yml CHANGED
@@ -101,4 +101,3 @@
101
101
  questions:
102
102
  - educationPricing
103
103
  - freeVersionTrialOption
104
-
package/frameworks/g-cloud-13/manifests/display_service.yml CHANGED
@@ -283,4 +283,4 @@
283
283
  - educationPricing
284
284
  - freeVersionTrialOption
285
285
  - freeVersionDescription
286
- - freeVersionLink
286
+ - freeVersionLink
package/frameworks/g-cloud-13/manifests/services_search_filters.yml CHANGED
@@ -5,18 +5,18 @@
5
5
  - serviceCategoriesSoftware
6
6
  - serviceCategoriesHosting
7
7
  - serviceCategoriesSupport
8
+ -
9
+ name: Multi cloud support
10
+ questions:
8
11
  - supportMultiCloud
9
-
10
12
  -
11
13
  name: Cloud deployment model
12
14
  questions:
13
15
  - cloudDeploymentModel
14
-
15
- -
16
+ -
16
17
  name: Supplier type
17
18
  questions:
18
19
  - resellingType
19
-
20
20
  -
21
21
  name: User support
22
22
  questions:
@@ -24,12 +24,14 @@
24
24
  - phoneSupport
25
25
  - webChatSupport
26
26
  - onsiteSupport
27
-
28
27
  -
29
- name: Service interface
28
+ name: User support accessibility
29
+ questions:
30
+ - userSupportAccessibility
31
+ -
32
+ name: Service interface accessibility
30
33
  questions:
31
34
  - serviceInterfaceAccessibility
32
-
33
35
  -
34
36
  name: Using the service
35
37
  questions:
@@ -37,64 +39,52 @@
37
39
  - installation
38
40
  - mobile
39
41
  - APISoftware
40
-
41
- -
42
+ -
42
43
  name: Metrics reporting
43
44
  questions:
44
45
  - metricsSoftwareHow
45
46
  - metricsHostingHow
46
-
47
47
  -
48
48
  name: Infrastructure or application metrics
49
49
  questions:
50
50
  - metricsHostingWhat
51
-
52
51
  -
53
52
  name: Scaling
54
53
  questions:
55
54
  - scalingType
56
-
57
55
  -
58
56
  name: Usage notifications
59
57
  questions:
60
58
  - usageNotifications
61
-
62
59
  -
63
60
  name: Backup and recovery
64
61
  questions:
65
62
  - backup
66
-
67
63
  -
68
64
  name: Connected public sector networks
69
65
  questions:
70
66
  - publicSectorNetworksTypes
71
-
72
67
  -
73
68
  name: Data protection between buyer and supplier networks
74
69
  questions:
75
70
  - dataProtectionBetweenNetworks
76
-
77
71
  -
78
72
  name: Data protection within supplier network
79
73
  questions:
80
74
  - dataProtectionWithinNetwork
81
-
82
75
  -
83
76
  name: Data storage and processing locations
84
77
  questions:
85
78
  - dataStorageAndProcessingLocations
86
-
87
79
  -
88
80
  name: User authentication
89
81
  questions:
90
82
  - userAuthenticationSoftware
91
83
  - userAuthenticationHosting
92
-
93
84
  -
94
85
  name: Management access authentication
95
86
  questions:
96
87
  - managementAccessAuthentication
97
-
98
88
  -
99
89
  name: Security certification
100
90
  questions:
@@ -104,30 +94,24 @@
104
94
  - standardsPCI
105
95
  - standardsCyberEssentials
106
96
  - standardsCyberEssentialsPlus
107
- - accreditationsOther
108
-
109
97
  -
110
98
  name: Security governance standards
111
99
  questions:
112
100
  - securityGovernanceStandards
113
-
114
101
  -
115
102
  name: Datacentre security standard
116
103
  questions:
117
104
  - datacentreSecurityStandards
118
-
119
105
  -
120
106
  name: Staff security clearance
121
107
  questions:
122
108
  - staffSecurityClearanceChecks
123
-
124
109
  -
125
110
  name: Minimum government security clearance
126
111
  questions:
127
112
  - governmentSecurityClearancesFilter
128
-
129
113
  -
130
114
  name: Pricing options
131
115
  questions:
132
116
  - educationPricing
133
- - freeVersionTrialOption
117
+ - freeVersionTrialOption
package/frameworks/g-cloud-13/messages/urls.yml CHANGED
@@ -1,5 +1,5 @@
1
1
  call_off_contract_url: https://www.gov.uk/government/publications/g-cloud-13-call-off-contract/__placeholder__
2
2
  customer_benefits_record_form_url: https://docs.google.com/forms/d/e/1FAIpQLSfQ3VeAMCIYNur4FoZxzn1F5BDkOTxFNK-4qbTlHVcyGqTgpw/viewform/__placeholder__
3
3
  framework_agreement_pdf_url: https://www.contractsfinder.service.gov.uk/Notice/52e2fd33-e6f3-4a4c-8697-d25ab76ea0a9
4
- framework_agreement_url: https://www.gov.uk/government/publications/g-cloud-13-framework-agreement/__placeholder__
4
+ framework_agreement_url: https://www.crowncommercial.gov.uk/g-cloud-13-contract-terms-and-conditions/
5
5
  supplier_guide_url: https://www.gov.uk/guidance/g-cloud-suppliers-guide
package/frameworks/g-cloud-13/search_mappings/services.json CHANGED
@@ -115,6 +115,10 @@
115
115
  "type": "keyword",
116
116
  "normalizer": "filter_normalizer"
117
117
  },
118
+ "dmfilter_supportMultiCloud": {
119
+ "type": "keyword",
120
+ "normalizer": "filter_normalizer"
121
+ },
118
122
  "dmfilter_cloudDeploymentModel": {
119
123
  "type": "keyword",
120
124
  "normalizer": "filter_normalizer"
@@ -139,6 +143,14 @@
139
143
  "type": "keyword",
140
144
  "normalizer": "filter_normalizer"
141
145
  },
146
+ "dmfilter_userSupportAccessibility": {
147
+ "type": "keyword",
148
+ "normalizer": "filter_normalizer"
149
+ },
150
+ "dmfilter_serviceInterfaceAccessibility": {
151
+ "type": "keyword",
152
+ "normalizer": "filter_normalizer"
153
+ },
142
154
  "dmfilter_browsersAccess": {
143
155
  "type": "keyword",
144
156
  "normalizer": "filter_normalizer"
@@ -219,6 +231,14 @@
219
231
  "type": "keyword",
220
232
  "normalizer": "filter_normalizer"
221
233
  },
234
+ "dmfilter_standardsCyberEssentials": {
235
+ "type": "keyword",
236
+ "normalizer": "filter_normalizer"
237
+ },
238
+ "dmfilter_standardsCyberEssentialsPlus": {
239
+ "type": "keyword",
240
+ "normalizer": "filter_normalizer"
241
+ },
222
242
  "dmfilter_securityGovernanceStandards": {
223
243
  "type": "keyword",
224
244
  "normalizer": "filter_normalizer"
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ccs-digitalmarketplace-frameworks",
3
- "version": "1.4.2",
3
+ "version": "1.6.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
@@ -12,13 +12,19 @@ attrs==20.3.0
12
12
  blinker==1.4
13
13
  # via gds-metrics
14
14
  boto3==1.17.55
15
- # via digitalmarketplace-utils
15
+ # via ccs-digitalmarketplace-utils
16
16
  botocore==1.20.55
17
17
  # via
18
18
  # boto3
19
19
  # s3transfer
20
20
  cachelib==0.6.0
21
21
  # via flask-session
22
+ ccs-digitalmarketplace-content-loader==9.2.0
23
+ # via -r requirements.txt
24
+ ccs-digitalmarketplace-utils==61.6.0
25
+ # via
26
+ # -r requirements.txt
27
+ # ccs-digitalmarketplace-content-loader
22
28
  certifi==2020.12.5
23
29
  # via requests
24
30
  cffi==1.14.5
@@ -28,9 +34,9 @@ chardet==4.0.0
28
34
  click==7.1.2
29
35
  # via flask
30
36
  contextlib2==0.6.0.post1
31
- # via digitalmarketplace-utils
37
+ # via ccs-digitalmarketplace-utils
32
38
  cryptography==36.0.1
33
- # via digitalmarketplace-utils
39
+ # via ccs-digitalmarketplace-utils
34
40
  deepmerge==1.0.1
35
41
  # via
36
42
  # -r requirements-dev.in
@@ -39,12 +45,8 @@ defusedxml==0.7.1
39
45
  # via odfpy
40
46
  deprecated==1.2.13
41
47
  # via redis
42
- digitalmarketplace-content-loader==9.1.0
43
- # via -r requirements.txt
44
- digitalmarketplace-utils==60.8.1
45
- # via
46
- # -r requirements.txt
47
- # digitalmarketplace-content-loader
48
+ digitalmarketplace-apiclient==23.2.0
49
+ # via ccs-digitalmarketplace-utils
48
50
  docopt==0.6.2
49
51
  # via
50
52
  # -r requirements.txt
@@ -53,35 +55,35 @@ flake8==3.9.1
53
55
  # via -r requirements-dev.in
54
56
  flask==1.0.4
55
57
  # via
56
- # digitalmarketplace-content-loader
57
- # digitalmarketplace-utils
58
+ # ccs-digitalmarketplace-content-loader
59
+ # ccs-digitalmarketplace-utils
58
60
  # flask-gzip
59
61
  # flask-login
60
62
  # flask-session
61
63
  # flask-wtf
62
64
  # gds-metrics
63
65
  flask-gzip==0.2
64
- # via digitalmarketplace-utils
66
+ # via ccs-digitalmarketplace-utils
65
67
  flask-login==0.5.0
66
- # via digitalmarketplace-utils
68
+ # via ccs-digitalmarketplace-utils
67
69
  flask-session==0.4.0
68
- # via digitalmarketplace-utils
70
+ # via ccs-digitalmarketplace-utils
69
71
  flask-wtf==0.14.3
70
- # via digitalmarketplace-utils
72
+ # via ccs-digitalmarketplace-utils
71
73
  fleep==1.0.1
72
- # via digitalmarketplace-utils
74
+ # via ccs-digitalmarketplace-utils
73
75
  future==0.18.2
74
76
  # via notifications-python-client
75
77
  gds-metrics==0.2.4
76
- # via digitalmarketplace-utils
78
+ # via ccs-digitalmarketplace-utils
77
79
  govuk-country-register==0.5.0
78
- # via digitalmarketplace-utils
80
+ # via ccs-digitalmarketplace-utils
79
81
  hypothesis==6.10.0
80
82
  # via -r requirements-dev.in
81
83
  idna==2.10
82
84
  # via requests
83
85
  inflection==0.5.1
84
- # via digitalmarketplace-content-loader
86
+ # via ccs-digitalmarketplace-content-loader
85
87
  iniconfig==1.1.1
86
88
  # via pytest
87
89
  itsdangerous==1.1.0
@@ -90,7 +92,7 @@ itsdangerous==1.1.0
90
92
  # flask-wtf
91
93
  jinja2==2.11.3
92
94
  # via
93
- # digitalmarketplace-content-loader
95
+ # ccs-digitalmarketplace-content-loader
94
96
  # flask
95
97
  jmespath==0.10.0
96
98
  # via
@@ -99,9 +101,9 @@ jmespath==0.10.0
99
101
  jsonschema==3.2.0
100
102
  # via -r requirements-dev.in
101
103
  mailchimp3==3.0.17
102
- # via digitalmarketplace-utils
104
+ # via ccs-digitalmarketplace-utils
103
105
  markdown==2.6.11
104
- # via digitalmarketplace-content-loader
106
+ # via ccs-digitalmarketplace-content-loader
105
107
  markupsafe==1.1.1
106
108
  # via
107
109
  # jinja2
@@ -113,9 +115,9 @@ mock==4.0.3
113
115
  monotonic==1.6
114
116
  # via notifications-python-client
115
117
  notifications-python-client==5.7.1
116
- # via digitalmarketplace-utils
118
+ # via ccs-digitalmarketplace-utils
117
119
  odfpy==1.4.1
118
- # via digitalmarketplace-utils
120
+ # via ccs-digitalmarketplace-utils
119
121
  packaging==20.9
120
122
  # via
121
123
  # pytest
@@ -142,21 +144,22 @@ pytest==6.2.3
142
144
  # via -r requirements-dev.in
143
145
  python-dateutil==2.8.1
144
146
  # via botocore
145
- python-json-logger==2.0.2
147
+ python-json-logger==2.0.4
146
148
  # via
147
149
  # -r requirements.txt
148
- # digitalmarketplace-utils
150
+ # ccs-digitalmarketplace-utils
149
151
  pytz==2021.1
150
- # via digitalmarketplace-utils
152
+ # via ccs-digitalmarketplace-utils
151
153
  pyyaml==5.4.1
152
154
  # via
153
155
  # -r requirements-dev.in
154
- # digitalmarketplace-content-loader
156
+ # ccs-digitalmarketplace-content-loader
155
157
  redis==4.1.4
156
- # via digitalmarketplace-utils
158
+ # via ccs-digitalmarketplace-utils
157
159
  requests==2.25.1
158
160
  # via
159
- # digitalmarketplace-utils
161
+ # ccs-digitalmarketplace-utils
162
+ # digitalmarketplace-apiclient
160
163
  # mailchimp3
161
164
  # notifications-python-client
162
165
  s3transfer==0.4.1
@@ -170,7 +173,7 @@ sortedcontainers==2.3.0
170
173
  toml==0.10.2
171
174
  # via pytest
172
175
  unicodecsv==0.14.1
173
- # via digitalmarketplace-utils
176
+ # via ccs-digitalmarketplace-utils
174
177
  urllib3==1.26.5
175
178
  # via
176
179
  # botocore
@@ -178,7 +181,7 @@ urllib3==1.26.5
178
181
  werkzeug==1.0.1
179
182
  # via flask
180
183
  workdays==1.4
181
- # via digitalmarketplace-utils
184
+ # via ccs-digitalmarketplace-utils
182
185
  wrapt==1.14.0
183
186
  # via deprecated
184
187
  wtforms==2.3.3
package/requirements.txt CHANGED
@@ -1,5 +1,5 @@
1
1
  docopt==0.6.2
2
2
  deepmerge==1.0.1
3
- python-json-logger==2.0.2
4
- digitalmarketplace-content-loader==9.1.0
5
- digitalmarketplace-utils==60.8.1
3
+ python-json-logger==2.0.4
4
+ ccs-digitalmarketplace-content-loader==9.2.0
5
+ ccs-digitalmarketplace-utils==61.6.0