From 6bf348e5c382b4202b5377bfcd99e5a4e9b268cb Mon Sep 17 00:00:00 2001 From: Chris McCarthy Date: Tue, 15 Aug 2023 11:14:23 +0100 Subject: [PATCH] Added the DSTL MIT license and updated the license in pyproject.toml --- LICENSE | 41 +++++++++++++++++------------------------ pyproject.toml | 2 +- 2 files changed, 18 insertions(+), 25 deletions(-) diff --git a/LICENSE b/LICENSE index a47c5477..93d6f98b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,28 +1,21 @@ -GFX License +MIT License -GFX Conditions +Copyright (c) 2023 - 2025 Defence Science and Technology Laboratory UK (https://dstl.gov.uk) -These GFX conditions confirm the provision of the following artefacts as GFX by Defence Science and Technology -Laboratory UK (DSTL) to QinetiQ Training and Simulation Ltd (QTSL) (and subcontractors engaged in activity on task by -request to the QQ mailbox): +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: -- PrimAITE Overview -- Access to PrimAITE & user instructions -- Track 2 tech support +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. -Suppliers will be required to sign up to the QTSL Collaborative Working Environment (CWE) SyOPs and fill out a User -Access Request Form. Provided they have a minimum of Cyber Essentials, and the user has the required clearance, they -will then be provided with credentials to access the site by QQ. - -DSTL mandate that any changes made to the PrimAITE source code be passed back to QTSL (during or on termination of the -task) so that QQ can capture any potential enhancements to PrimAITE. - -This contains OFFICIAL information to be used to inform work on ARCD tasks (under SERAPIS). - -The material is supplied in confidence to QQ and their subcontractors under SERAPIS, and is issued to inform only those -that need to know its contents in the course of their official duties whilst engaged in activities under the contract. -The material consists of proprietary information which is the property of the Crown. The information contained within -the material may constitute valuable technical information and be commercially sensitive in relation to third parties; -therefore it may not be used or copied for any non-Governmental or commercial purpose without the prior written consent -of DSTL. The material must be stored and protected appropriately.All material must be destroyed at the end of the task. -Please note the contractual obligations relating to provision of these materials. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/pyproject.toml b/pyproject.toml index 2f17a827..229d29d5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ license = {file = "LICENSE"} requires-python = ">=3.8, <3.11" dynamic = ["version", "readme"] classifiers = [ - "License :: GFX", + "License :: OSI Approved :: MIT License", "Development Status :: 5 - Production/Stable", "Operating System :: Microsoft :: Windows", "Operating System :: MacOS",