Merge pull request #251 from FAIRDataPipeline/hotfix/test_fix

FIx test, update citations

.gitignore

@@ -155,3 +155,6 @@ token.txt
 # GitHub config
 
 !/.github/*
+
+# data_store
+/data_store 

CITATION.cff

@@ -17,6 +17,15 @@ authors:
   given-names: Nathan
   affiliation: United Kingdom Atomic Energy Authority
   orcid: https://orcid.org/0000-0003-4359-6337
+- family-names: Viola
+  given-names: Bruno
+  affiliation: United Kingdom Atomic Energy Authority
+  orcid: https://orcid.org/0000-0001-5406-5860
+- family-names: Field
+  given-names: Ryan
+  affiliation: University of Glasgow
+  orcid: https://orcid.org/0000-0002-4424-9890
+
 date-released: 2021-09-13
 keywords:
 - FAIR Data Pipeline
@@ -27,4 +36,4 @@ license: BSD-2-Clause
 message: If you use this software, please cite it using these metadata.
 repository-code: https://github.com/FAIRDataPipeline/FAIR-CLI/
 title: "The FAIR Data Pipeline command line tool"
-version: 0.3.0
+version: 0.3.1

fair/cli.py

@@ -36,6 +36,7 @@
     "Nathan Cummings (UKAEA)",
     "Kristian Zarebski (UKAEA)",
     "Dennis Reddyhoff (University of Sheffield)",
+    "Ryan Field (University of Glasgow",
 ]
 __license__ = "BSD-2-Clause"
 __status__ = "Development"

fair/configuration/__init__.py

@@ -291,6 +291,7 @@ def get_remote_token(
             )
 
         return _token
+    return None
 
 
 def get_local_data_store() -> str:

fair/session.py

@@ -400,7 +400,7 @@ def pull(self, remote: str = "origin"):
                 fdp_conf.get_remote_uri(self._session_loc, remote),
                 fdp_req.local_token(),
                 fdp_conf.get_remote_token(
-                    self._session_loc, remote, local=self._local
+                    self._session_loc, remote, self._local
                 ),
             )
 

pyproject.toml

@@ -4,6 +4,8 @@ authors = [
   "Nathan Cummings <nathan.cummings@ukaea.uk>",
   "Dennis Reddyhoff <d.reddyhoff@sheffield.ac.uk>",
   "Kristian Zarebski <kristian.zarebski@ukaea.uk>",
+  "Bruno Viola <bruno.viola@ukaea.uk>",
+  "Ryan Field <ryan.field@glasgow.ac.uk>",
 ]
 classifiers = [
   "License :: OSI Approved :: BSD License",
@@ -21,7 +23,7 @@ classifiers = [
 ]
 description = "Synchronization interface for the SCRC FAIR Data Pipeline registry"
 name = "fair-cli"
-version = "0.3.0"
+version = "0.3.1"
 
 homepage = "https://www.fairdatapipeline.org/"
 

tests/test_with_api.py

@@ -36,7 +36,7 @@ def test_pull_new(
     _manage = os.path.join(remote_registry._install, "manage.py")
     mocker.patch(
         "fair.configuration.get_remote_token",
-        lambda *args: remote_registry._token,
+        lambda *args, **kwargs: remote_registry._token,
     )
     mocker.patch(
         "fair.registry.requests.local_token",
@@ -154,7 +154,7 @@ def test_pull_existing(
 ):
     mocker.patch(
         "fair.configuration.get_remote_token",
-        lambda *args: remote_registry._token,
+        lambda *args, **kwargs: remote_registry._token,
     )
     mocker.patch(
         "fair.registry.requests.local_token",