ccs-digitalmarketplace-frameworks 4.4.8 → 4.4.10

package/frameworks/digital-outcomes-and-specialists-7/questions/additional-lot-questions/demonstrateCapacity.yml

@@ -1,4 +1,4 @@
-name: Demonstrate capacity
+name: Capability and capacity
 question: Assessment methodology
 question_advice: >
   <p>In order to satisfy the award criteria, you must fully address each of the sub-criteria a) to b):</p>

package/frameworks/digital-outcomes-and-specialists-7/questions/additional-lot-questions/demonstrateContinuousImprovement.yml

@@ -1,4 +1,4 @@
-name: Demonstrate continuous improvement
+name: Collaboration and knowledge transfer
 question: Assessment methodology
 question_advice: >
   <p>In order to satisfy the award criteria, you must fully address each of the sub-criteria a) to b): </p>

package/frameworks/digital-outcomes-and-specialists-7/questions/additional-lot-questions/demonstrateQuality.yml

@@ -1,9 +1,10 @@
-name: Demonstrate quality
-question: >
-  <p>In order to satisfy the award criteria, you must fully address each of the sub-criteria (a) and (b) in your response:</p>
-  <P>(a)  Demonstrate how you will ensure quality in delivery and maintain quality through the life of call off contracts to meet buyers' requirements (in accordance with the requirements set out under part 3.2.3 of the Specification).</p>
-  <p>(b)  Demonstrate how you will ensure your staff deployed on assignments under this framework are at the forefront of current thinking and practises to address public sector buyer requirements and how you transfer this knowledge throughout your organisation (in accordance with the requirements set out under part 5.4 of the Specification).</p>
-
+name: Quality and Innovation
+question: Assessment methodology
+question_advice: >
+  <p>In order to satisfy the award criteria, you must fully address each of the sub-criteria a) to b):</p>
+  <p>You must clearly demonstrate:</p>
+  <p>a) How you will ensure that the deliverables meet the quality standards agreed with the buyer. Your response must clearly describe what measures are in place to effectively identify, address and resolve any deviations from the expected quality during the lifetime of the call off contract (in accordance with the requirements set out under part 3.2.3.1 of the Specification).</p>
+  <p>b) How you will ensure your staff deployed under this framework are satisfactorily trained to ensure that they remain able to adapt and deliver the services in line with emerging best practice and government standards. Your response must clearly describe how you will transfer this knowledge throughout your organisation to deliver innovative solutions for buyers (in accordance with the requirements set out under part 5.4.1 to 5.4 4 of the Specification).</p>
 type: textbox_large
 max_length_in_words: 700
 hint: You must read Attachment 2d Quality Questionnaire for the details of this question's requirement, assessment methodology, response guidance and marking scheme.

package/frameworks/digital-outcomes-and-specialists-7/questions/additional-lot-questions/multiqContinuousImprovementAndKnowledgeTransfer.yml

@@ -1,4 +1,4 @@
-name: Demonstrate continuous improvement and knowledge transfer
+name: Collaboration and knowledge transfer
 question: CCS requires you to demonstrate how your organisation will effectively collaborate with the buyer and transfer knowledge to ensure continued service delivery and appropriate handover throughout each stage of the contract lifecycle.
 depends:
   - "on": "lot"

package/frameworks/digital-outcomes-and-specialists-7/questions/declaration/averageNumberOfDaysTakenToPay.yml

@@ -1,5 +1,5 @@
 name: Average number of days taken to pay
-question: Please provide the average number of days taken by you to pay an invoice to those in your immediate supply chain on all contracts for the most recent six month reporting period. This should include the percentage of invoices paid within each of the following categories (this should include all situations where payments are due; not all payments involve an invoice).
+question: Please provide the average number of days taken by you to pay an invoice to those in your immediate supply chain on all contracts for the most recent six month reporting period.
 
 hidden: true
 type: number

package/frameworks/digital-outcomes-and-specialists-7/questions/declaration/averageNumberOfDaysTakenToPayInvoicesPrior6Months.yml

@@ -1,5 +1,5 @@
 name: Percentage of invoices paid prior 6 months
-question: Please provide the average number of days taken by you to pay an invoice to those in your immediate supply chain on all contracts for the prior six month reporting period. This should include the percentage of invoices paid within each of the following categories (this should include all situations where payments are due; not all payments involve an invoice).
+question: Please provide the average number of days taken by you to pay an invoice to those in your immediate supply chain on all contracts for the prior six month reporting period.
 
 hidden: true
 type: number

package/package.json

@@ -1,7 +1,13 @@
 {
   "name": "ccs-digitalmarketplace-frameworks",
-  "version": "4.4.8",
+  "version": "4.4.10",
   "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"
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frameworks.git"
+  },
+  "author": "enquiries@digitalmarketplace.service.gov.uk",
+  "files": [
+    "frameworks/**"
+  ]
 }

package/.flake8

@@ -1,12 +0,0 @@
-[flake8]
-# Rule definitions: http://flake8.pycqa.org/en/latest/user/error-codes.html
-# D203: 1 blank line required before class docstring
-# E402: module level import not at top of file
-# W503: line break before binary operator
-exclude = venv*,__pycache__,node_modules,bower_components
-ignore = D203,W503
-max-complexity = 12
-max-line-length = 120
-per-file-ignores =
-    scripts/* : E402
-    tasks.py: F401

package/.github/dependabot.yml

@@ -1,13 +0,0 @@
-version: 2
-updates:
-- package-ecosystem: pip
-  directory: "/"
-  schedule:
-    interval: weekly
-    time: "03:00"
-  open-pull-requests-limit: 10
-- package-ecosystem: "github-actions"
-  directory: "/"
-  schedule:
-    interval: weekly
-    time: "03:00"

package/.github/workflows/publish_package.yml

@@ -1,22 +0,0 @@
-name: Node.js Package
-on:
-  release:
-    types: [published]
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Read .nvmrc
-      run: echo "NVMRC=$(cat .nvmrc)" >> $GITHUB_OUTPUT
-      id: nvm
-
-    - uses: actions/checkout@v4
-    # Setup .npmrc file to publish to npm
-    - uses: actions/setup-node@v4
-      with:
-        node-version: '${{ steps.nvm.outputs.NVMRC }}'
-        registry-url: 'https://registry.npmjs.org'
-    - run: npm install
-    - run: npm publish
-      env:
-        NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

package/.github/workflows/release.yml

@@ -1,32 +0,0 @@
-name: Tag release
-
-on: 
-  push:
-    branches:
-      - main
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Get package version
-        id: package_version
-        run: echo "package-version=v$(jq -r ".version" package.json)" >> $GITHUB_OUTPUT
-
-      - name: Check if version tag already exists
-        id: version_tag
-        uses: mukunku/tag-exists-action@bdad1eaa119ce71b150b952c97351c75025c06a9
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag: ${{ steps.package_version.outputs.package-version }}
-
-      - name: Create GitHub release
-        if: ${{ steps.version_tag.outputs.exists == 'false' }}
-        uses: ncipollo/release-action@v1
-        with:
-          token: ${{ secrets.DM_GITHUB_TOKEN }}
-          tag: ${{ steps.package_version.outputs.package-version }}
-          name: Release ${{ steps.package_version.outputs.package-version }}

package/.github/workflows/test.yml

@@ -1,66 +0,0 @@
-name: Run tests
-on: [pull_request]
-jobs:
-  unit_test:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: [ '3.11' ]
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Setup Python cache
-        uses: actions/cache@v4
-        with:
-          path: venv
-          key: venv-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('**/requirements*.txt') }}
-
-      - name: Install developer tools
-        run: make bootstrap
-
-      - name: Install dependencies
-        run: invoke requirements-dev
-
-      - name: Run tests
-        run: invoke test
-
-  functional_test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: [ '3.11' ]
-        script:
-          - 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
-          - scripts/generate-filter-schemas.py --output-path=/tmp
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Setup Python cache
-        uses: actions/cache@v4
-        with:
-          path: venv
-          key: venv-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('**/requirements*.txt') }}
-
-      - name: Install developer tools
-        run: make bootstrap
-
-      - name: Install dependencies
-        run: invoke requirements-dev
-
-      - name: Test script
-        run: venv/bin/python ${{ matrix.script }}

package/.nvmrc

@@ -1 +0,0 @@
-lts/jod

package/.pre-commit-config.yaml

@@ -1,16 +0,0 @@
----
-repos:
-- repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v5.0.0
-  hooks:
-    - id: trailing-whitespace
-    - id: end-of-file-fixer
-    - id: check-yaml
-    - id: check-added-large-files
-    - id: detect-private-key
-
-- repo: https://github.com/PyCQA/flake8
-  rev: 7.0.0
-  hooks:
-    - id: flake8
-      pass_filenames: false

package/.python-version

@@ -1 +0,0 @@
-3.11

package/.secrets.baseline

@@ -1,66 +0,0 @@
-{
-  "exclude": {
-    "files": null,
-    "lines": null
-  },
-  "generated_at": "2020-09-01T07:42:41Z",
-  "plugins_used": [
-    {
-      "name": "AWSKeyDetector"
-    },
-    {
-      "name": "ArtifactoryDetector"
-    },
-    {
-      "base64_limit": 4.5,
-      "name": "Base64HighEntropyString"
-    },
-    {
-      "name": "BasicAuthDetector"
-    },
-    {
-      "name": "CloudantDetector"
-    },
-    {
-      "hex_limit": 3,
-      "name": "HexHighEntropyString"
-    },
-    {
-      "name": "IbmCloudIamDetector"
-    },
-    {
-      "name": "IbmCosHmacDetector"
-    },
-    {
-      "name": "JwtTokenDetector"
-    },
-    {
-      "keyword_exclude": null,
-      "name": "KeywordDetector"
-    },
-    {
-      "name": "MailchimpDetector"
-    },
-    {
-      "name": "PrivateKeyDetector"
-    },
-    {
-      "name": "SlackDetector"
-    },
-    {
-      "name": "SoftlayerDetector"
-    },
-    {
-      "name": "StripeDetector"
-    },
-    {
-      "name": "TwilioKeyDetector"
-    }
-  ],
-  "results": {},
-  "version": "0.13.1",
-  "word_list": {
-    "file": null,
-    "hash": null
-  }
-}

package/CHANGELOG.md

@@ -1,27 +0,0 @@
-# Digital Marketplace frameworks changelog
-
-Records breaking changes from major version bumps
-
-## 4.3.0
-
-Add the G-Cloud 15 framework
-
-## 4.0.0
-
-Add the FVRA questions section
-
-## 3.0.0
-
-Add the agreements questions for the framework award form
-
-## 2.0.0
-
-Rename evaluations to additional lot questions
-
-## 1.9.0
-
-Add the Digital Outcomes and Specialists 7 framework
-
-## 1.8.0
-
-Add the G-Cloud 14 framework

package/Makefile

@@ -1,21 +0,0 @@
-
-.DEFAULT_GOAL := bootstrap
-
-%:
-	-@[ -z "$$TERM" ] || tput setaf 1  # red
-	@>&2 echo warning: calling '`make`' is being deprecated in this repo, you should use '`invoke` (https://pyinvoke.org)' instead.
-	-@[ -z "$$TERM" ] || tput setaf 9  # default
-	@# pass goals to '`invoke`'
-	invoke $(or $(MAKECMDGOALS), $@)
-	@exit
-
-help:
-	invoke --list
-
-.PHONY: bootstrap
-bootstrap:
-	pip install digitalmarketplace-developer-tools
-	@echo done
-	-@[ -z "$$TERM" ] || tput setaf 2  # green
-	@>&2 echo dmdevtools has been installed globally, run developer tasks with '`invoke`'
-	-@[ -z "$$TERM" ] || tput setaf 9  # default

package/SECURITY.md

@@ -1,7 +0,0 @@
-Contact: cybersecurity@crowncommercial.gov.uk
-
-Policy: https://www.crowncommercial.gov.uk/vulnerability-disclosure-policy
-
-Acknowledgements: https://www.crowncommercial.gov.uk/vulnerability-disclosure-policy/acknowledgements
-
-Encryption: https://github.com/Crown-Commercial-Service/ccs-vulnerability-disclosure-policy/blob/main/vulnerability-disclosure-public-encryption.pub

package/SECURITY.txt

@@ -1,7 +0,0 @@
-Contact: cybersecurity@crowncommercial.gov.uk
-
-Policy: https://www.crowncommercial.gov.uk/about-ccs/vulnerability-disclosure-policy/
-
-Acknowledgements: https://github.com/Crown-Commercial-Service/ccs-vulnerability-disclosure-policy/blob/main/acknowledgements.txt
-
-Encryption: https://github.com/Crown-Commercial-Service/ccs-vulnerability-disclosure-policy/blob/main/vulnerability-disclosure-public-encryption.pub

package/default.nix

@@ -1,48 +0,0 @@
-argsOuter@{...}:
-let
-  # specifying args defaults in this slightly non-standard way to allow us to include the default values in `args`
-  args = rec {
-    pkgs = import <nixpkgs> {};
-    pythonPackages = pkgs.python36Packages;
-    forDev = true;
-    localOverridesPath = ./local.nix;
-  } // argsOuter;
-in (with args; {
-  digitalMarketplaceFrameworksEnv = (pkgs.stdenv.mkDerivation rec {
-    name = "digitalmarketplace-frameworks-env";
-    shortName = "dm-fwks";
-    buildInputs = [
-      pythonPackages.python
-      pkgs.glibcLocales
-      pkgs.libffi
-      pkgs.libyaml
-      # pip requires git to fetch some of its dependencies
-      pkgs.git
-      # for `cryptography`
-      pkgs.openssl
-    ] ++ pkgs.stdenv.lib.optionals forDev ([
-      ] ++ pkgs.stdenv.lib.optionals pkgs.stdenv.isDarwin [
-      ]
-    );
-
-    hardeningDisable = pkgs.stdenv.lib.optionals pkgs.stdenv.isDarwin [ "format" ];
-
-    GIT_SSL_CAINFO="${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
-    VIRTUALENV_ROOT = "venv${pythonPackages.python.pythonVersion}";
-    VIRTUAL_ENV_DISABLE_PROMPT = "1";
-    SOURCE_DATE_EPOCH = "315532800";
-
-    # if we don't have this, we get unicode troubles in a --pure nix-shell
-    LANG="en_GB.UTF-8";
-
-    shellHook = ''
-      export PS1="\[\e[0;36m\](nix-shell\[\e[0m\]:\[\e[0;36m\]${shortName})\[\e[0;32m\]\u@\h\[\e[0m\]:\[\e[0m\]\[\e[0;36m\]\w\[\e[0m\]\$ "
-
-      if [ ! -e $VIRTUALENV_ROOT ]; then
-        ${pythonPackages.python}/bin/python -m venv $VIRTUALENV_ROOT
-      fi
-      source $VIRTUALENV_ROOT/bin/activate
-      make requirements${pkgs.stdenv.lib.optionalString forDev "-dev"}
-    '';
-  }).overrideAttrs (if builtins.pathExists localOverridesPath then (import localOverridesPath args) else (x: x));
-})

package/local.example.nix

@@ -1,22 +0,0 @@
-# default.nix calls out to the file local.nix if it exists, expecting a function which it will call, applying first
-# the args passed to the original default.nix and then `oldAttrs`, the attrset originally applied to mkDerivation.
-#
-# the function should return an attrset altered to the local user's desires, as they would wish to be applied to
-# mkDerivation to produce the env
-
-args: oldAttrs: oldAttrs // {
-  # here we add some of our favourite packages to the environment which aren't necessarily to everyone's tastes
-  buildInputs = oldAttrs.buildInputs ++ [
-    args.pkgs.vim
-    args.pythonPackages.ipython
-  ];
-
-  shellHook =  oldAttrs.shellHook + ''
-    # PS1 can't be set as a normal derivation attr as it gets clobbered early on in the upstream shellHook script
-    export PS1="⚡$PS1⚡"
-
-    # inject some whimsy into our session - note here we access a package which we don't actually end up
-    # explicitly exposing to the final environment
-    ${args.pkgs.fortune}/bin/fortune
-  '';
-}

package/pyproject.toml

@@ -1,45 +0,0 @@
-[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*"