Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIx test, update citations #251

Merged
merged 1 commit into from
Jun 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -155,3 +155,6 @@ token.txt
# GitHub config

!/.github/*

# data_store
/data_store
11 changes: 10 additions & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
1 change: 1 addition & 0 deletions fair/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions fair/configuration/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@ def get_remote_token(
)

return _token
return None


def get_local_data_store() -> str:
Expand Down
2 changes: 1 addition & 1 deletion fair/session.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
),
)

Expand Down
4 changes: 3 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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/"

Expand Down
4 changes: 2 additions & 2 deletions tests/test_with_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down