From b1cf0b5fa6c558fca86d8bcb4fb35267966d76fd Mon Sep 17 00:00:00 2001 From: Andreas Angourakis Date: Thu, 13 Oct 2022 14:37:22 +0200 Subject: [PATCH 1/3] adapted to nassa-schema v0.3.0 --- CHANGELOG.md | 1 + src/NASSA/Types.hs | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3bcefc..86adf60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +- V 0.7.0: Adapted checks on softwareDependencies to nassa-schema v0.3.0 - V 0.6.1: Discarded checks on designDetailsFile field - V 0.6.0: Added all the necessary mechanisms to make nassa aware of the NASSA standard versions of modules - V 0.5.0: Added a cli subcommand validate diff --git a/src/NASSA/Types.hs b/src/NASSA/Types.hs index 3cbc3f3..99d7696 100644 --- a/src/NASSA/Types.hs +++ b/src/NASSA/Types.hs @@ -35,7 +35,6 @@ data NassaModuleYamlStruct = NassaModuleYamlStruct { , _nassaYamlModellingKeywords :: [String] , _nassaYamlProgrammingKeywords :: [String] , _nassaYamlImplementations :: [Implementation] - , _nassaYamlSoftwareDependencies :: [String] , _nassaYamlInputs :: Maybe [ModuleInput] , _nassaYamlOutputs :: Maybe [ModuleOutput] -- , _nassaYamlDocsCheckList :: DocsCheckList @@ -60,7 +59,6 @@ instance FromJSON NassaModuleYamlStruct where <*> v .: "modellingKeywords" <*> v .: "programmingKeywords" <*> v .: "implementations" - <*> v .: "softwareDependencies" <*> v .:? "inputs" <*> v .:? "outputs" -- <*> v .: "docsCheckList" @@ -227,6 +225,7 @@ instance FromJSON DomainKeyword where data Implementation = Implementation { _implementationLanguage :: ProgrammingLanguage , _implementationCodeDir :: FilePath + , _nassaYamlSoftwareDependencies :: [String] } deriving (Show, Eq) @@ -234,6 +233,7 @@ instance FromJSON Implementation where parseJSON = withObject "implementations" $ \v -> Implementation <$> v .: "language" <*> v .: "codeDir" + <*> v .: "softwareDependencies" data ProgrammingLanguage = LanguageR From e5a98da633bf6c2ba5a1dd7c339a60ed1ae9ee7f Mon Sep 17 00:00:00 2001 From: Andreas Angourakis Date: Thu, 13 Oct 2022 20:38:34 +0200 Subject: [PATCH 2/3] Update nassa.cabal --- nassa.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nassa.cabal b/nassa.cabal index fe43c0d..25cc1fc 100644 --- a/nassa.cabal +++ b/nassa.cabal @@ -1,5 +1,5 @@ name: nassa -version: 0.6.0 +version: 0.7.0 synopsis: A package to validate NASSA modules description: NASSA maintains a library of agent-based-modelling algorithms in individual code modules. Each module is defined by a NASSA.yml file. nassa-hs validates these .yml files. license: MIT From a6b1b536b352da5a54728b383e076ebbe0f402b1 Mon Sep 17 00:00:00 2001 From: Andreas Angourakis Date: Thu, 13 Oct 2022 20:38:49 +0200 Subject: [PATCH 3/3] Update Types.hs --- src/NASSA/Types.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NASSA/Types.hs b/src/NASSA/Types.hs index 99d7696..87bacc2 100644 --- a/src/NASSA/Types.hs +++ b/src/NASSA/Types.hs @@ -80,7 +80,7 @@ instance FromJSON ModuleID where type NassaVersion = Version validNassaVersions :: [NassaVersion] -validNassaVersions = map makeVersion [[0,1,0]] +validNassaVersions = map makeVersion [[0,3,0]] latestNassaVersion :: NassaVersion latestNassaVersion = last validNassaVersions