-
+
{createdUser !== null? createdUserContent : formContent}
diff --git a/frontend/src/PaginatedTable.tsx b/frontend/src/PaginatedTable.tsx
index c4e1a7d5..36c580f9 100644
--- a/frontend/src/PaginatedTable.tsx
+++ b/frontend/src/PaginatedTable.tsx
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
export type unused = any
// /**
diff --git a/frontend/src/Tokens.tsx b/frontend/src/Tokens.tsx
index 1f579d19..9df00b66 100644
--- a/frontend/src/Tokens.tsx
+++ b/frontend/src/Tokens.tsx
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
import React, {Fragment, useState} from 'react';
import TextField from '@mui/material/TextField';
diff --git a/frontend/src/UseStyles.ts b/frontend/src/UseStyles.ts
index a531a7fd..0cee0463 100644
--- a/frontend/src/UseStyles.ts
+++ b/frontend/src/UseStyles.ts
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
import { makeStyles } from 'tss-react/mui';
diff --git a/frontend/src/UserProfile.tsx b/frontend/src/UserProfile.tsx
index 3df87bb8..f00809ab 100644
--- a/frontend/src/UserProfile.tsx
+++ b/frontend/src/UserProfile.tsx
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
import React, {SyntheticEvent, useState} from 'react';
import TextField from '@mui/material/TextField';
diff --git a/frontend/src/UserRoleSet.tsx b/frontend/src/UserRoleSet.tsx
index 398bf40f..b3f97426 100644
--- a/frontend/src/UserRoleSet.tsx
+++ b/frontend/src/UserRoleSet.tsx
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
import Connection, {APIConnection, User} from './APIConnection'
import React, {Component} from "react";
diff --git a/frontend/src/__mocks__/CellList.tsx b/frontend/src/__mocks__/CellList.tsx
index 61174819..ca855039 100644
--- a/frontend/src/__mocks__/CellList.tsx
+++ b/frontend/src/__mocks__/CellList.tsx
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
import React from "react";
import {CellDetailProps} from "../CellList";
diff --git a/frontend/src/__mocks__/DatasetChart.tsx b/frontend/src/__mocks__/DatasetChart.tsx
index f208bac3..ef59d27c 100644
--- a/frontend/src/__mocks__/DatasetChart.tsx
+++ b/frontend/src/__mocks__/DatasetChart.tsx
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
import React from "react";
import {DatasetChartProps} from "../DatasetChart";
diff --git a/frontend/src/__mocks__/Files.tsx b/frontend/src/__mocks__/Files.tsx
index cc2d2670..a32c95fd 100644
--- a/frontend/src/__mocks__/Files.tsx
+++ b/frontend/src/__mocks__/Files.tsx
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
import React from "react";
import {FilesProps} from "../Files";
diff --git a/frontend/src/__mocks__/GetDatasetMatlab.js b/frontend/src/__mocks__/GetDatasetMatlab.js
index 44895c4e..f4703a66 100644
--- a/frontend/src/__mocks__/GetDatasetMatlab.js
+++ b/frontend/src/__mocks__/GetDatasetMatlab.js
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
import React from "react";
diff --git a/frontend/src/__mocks__/GetDatasetPython.js b/frontend/src/__mocks__/GetDatasetPython.js
index 9b59e427..2591a271 100644
--- a/frontend/src/__mocks__/GetDatasetPython.js
+++ b/frontend/src/__mocks__/GetDatasetPython.js
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
import React from "react";
diff --git a/frontend/src/__mocks__/HarvesterDetail.tsx b/frontend/src/__mocks__/HarvesterDetail.tsx
index 9b0dd578..8ded8191 100644
--- a/frontend/src/__mocks__/HarvesterDetail.tsx
+++ b/frontend/src/__mocks__/HarvesterDetail.tsx
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
import React from "react";
import {HarvesterDetailProps} from "../HarvesterDetail";
diff --git a/frontend/src/__mocks__/HarvesterEnv.tsx b/frontend/src/__mocks__/HarvesterEnv.tsx
index 68932cd0..4c104147 100644
--- a/frontend/src/__mocks__/HarvesterEnv.tsx
+++ b/frontend/src/__mocks__/HarvesterEnv.tsx
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
import React from "react";
import {HarvesterEnvProps} from "../HarvesterEnv";
diff --git a/frontend/src/__mocks__/UserRoleSet.tsx b/frontend/src/__mocks__/UserRoleSet.tsx
index eabdf7c0..78957d99 100644
--- a/frontend/src/__mocks__/UserRoleSet.tsx
+++ b/frontend/src/__mocks__/UserRoleSet.tsx
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
import React from "react";
import {UserSetProps} from "../UserRoleSet";
diff --git a/frontend/src/auth/index.js b/frontend/src/auth/index.js
index 5100ff62..9579c29e 100644
--- a/frontend/src/auth/index.js
+++ b/frontend/src/auth/index.js
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
import {createAuthProvider} from 'react-token-auth';
diff --git a/frontend/src/index.css b/frontend/src/index.css
index c2e88ca0..64b19103 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -1,7 +1,7 @@
/*
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
*/
body {
diff --git a/frontend/src/index.d.ts b/frontend/src/index.d.ts
index 31c33bb0..302508e7 100644
--- a/frontend/src/index.d.ts
+++ b/frontend/src/index.d.ts
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
// Prevent complaints that 'spacing' isn't a DefaultTheme property
declare module "@mui/private-theming" {
diff --git a/frontend/src/index.jsx b/frontend/src/index.jsx
index 8b287944..0b416ea5 100644
--- a/frontend/src/index.jsx
+++ b/frontend/src/index.jsx
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
import React from 'react';
import { createRoot } from 'react-dom/client';
diff --git a/frontend/src/reportWebVitals.js b/frontend/src/reportWebVitals.js
index f6092861..d5ac77e0 100644
--- a/frontend/src/reportWebVitals.js
+++ b/frontend/src/reportWebVitals.js
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
const reportWebVitals = onPerfEntry => {
if (onPerfEntry && onPerfEntry instanceof Function) {
diff --git a/frontend/src/setupTests.js b/frontend/src/setupTests.js
index 67803efd..779d405c 100644
--- a/frontend/src/setupTests.js
+++ b/frontend/src/setupTests.js
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
// jest-dom adds custom jest matchers for asserting on DOM nodes.
// allows you to do things like:
diff --git a/frontend/src/test/ActionButtons.test.js b/frontend/src/test/ActionButtons.test.js
index c250fb1e..b7c4f226 100644
--- a/frontend/src/test/ActionButtons.test.js
+++ b/frontend/src/test/ActionButtons.test.js
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
globalThis.IS_REACT_ACT_ENVIRONMENT = true;
diff --git a/frontend/src/test/ActivateUsers.test.js b/frontend/src/test/ActivateUsers.test.js
index 397b1eac..f48ecca2 100644
--- a/frontend/src/test/ActivateUsers.test.js
+++ b/frontend/src/test/ActivateUsers.test.js
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
globalThis.IS_REACT_ACT_ENVIRONMENT = true;
diff --git a/frontend/src/test/CellList.test.js b/frontend/src/test/CellList.test.js
index 6fab46a8..95ef31b8 100644
--- a/frontend/src/test/CellList.test.js
+++ b/frontend/src/test/CellList.test.js
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
globalThis.IS_REACT_ACT_ENVIRONMENT = true;
diff --git a/frontend/src/test/Cells.test.js b/frontend/src/test/Cells.test.js
index db812436..ab923ffb 100644
--- a/frontend/src/test/Cells.test.js
+++ b/frontend/src/test/Cells.test.js
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
globalThis.IS_REACT_ACT_ENVIRONMENT = true;
diff --git a/frontend/src/test/DatasetChart.test.js b/frontend/src/test/DatasetChart.test.js
index db3e4db3..c0e9a737 100644
--- a/frontend/src/test/DatasetChart.test.js
+++ b/frontend/src/test/DatasetChart.test.js
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
globalThis.IS_REACT_ACT_ENVIRONMENT = true;
diff --git a/frontend/src/test/Datasets.test.js b/frontend/src/test/Datasets.test.js
index 72fe5ebd..05172257 100644
--- a/frontend/src/test/Datasets.test.js
+++ b/frontend/src/test/Datasets.test.js
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
globalThis.IS_REACT_ACT_ENVIRONMENT = true;
diff --git a/frontend/src/test/Equipment.test.js b/frontend/src/test/Equipment.test.js
index f138137c..3c9dba6b 100644
--- a/frontend/src/test/Equipment.test.js
+++ b/frontend/src/test/Equipment.test.js
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
globalThis.IS_REACT_ACT_ENVIRONMENT = true;
diff --git a/frontend/src/test/Files.test.js b/frontend/src/test/Files.test.js
index d2762eb7..07027793 100644
--- a/frontend/src/test/Files.test.js
+++ b/frontend/src/test/Files.test.js
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
globalThis.IS_REACT_ACT_ENVIRONMENT = true;
diff --git a/frontend/src/test/Harvester.test.js b/frontend/src/test/Harvester.test.js
index 32b6e143..b6a5ee61 100644
--- a/frontend/src/test/Harvester.test.js
+++ b/frontend/src/test/Harvester.test.js
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
globalThis.IS_REACT_ACT_ENVIRONMENT = true;
diff --git a/frontend/src/test/HarvesterDetail.test.js b/frontend/src/test/HarvesterDetail.test.js
index d9e3b0d5..bdf8021d 100644
--- a/frontend/src/test/HarvesterDetail.test.js
+++ b/frontend/src/test/HarvesterDetail.test.js
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
globalThis.IS_REACT_ACT_ENVIRONMENT = true;
@@ -65,6 +65,7 @@ describe('HarvesterDetail', () => {
const new_stable_time = 100
await act(async () => {
await user.type(screen.getAllByPlaceholderText(/path$/)[1], new_path);
+ await user.type(screen.getAllByPlaceholderText(".*")[1], '{Backspace>5}^[[^T]');
await user.type(screen.getAllByDisplayValue(
mock_paths[0].stable_time)[1],
`{Backspace>10}${new_stable_time.toString()}`
@@ -77,6 +78,7 @@ describe('HarvesterDetail', () => {
body: JSON.stringify({
harvester: mock_harvester.url,
path: new_path,
+ regex: '^[^T]',
stable_time: new_stable_time.toString(),
}),
method: 'POST'
diff --git a/frontend/src/test/HarvesterEnv.test.js b/frontend/src/test/HarvesterEnv.test.js
index 7e7ee511..b645a83b 100644
--- a/frontend/src/test/HarvesterEnv.test.js
+++ b/frontend/src/test/HarvesterEnv.test.js
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
globalThis.IS_REACT_ACT_ENVIRONMENT = true;
diff --git a/frontend/src/test/README.md b/frontend/src/test/README.md
index 3aa981db..86512b45 100644
--- a/frontend/src/test/README.md
+++ b/frontend/src/test/README.md
@@ -1,4 +1,4 @@
-# Galvanalyser Testing Strategy
+# Galv Testing Strategy
## Unit Testing
diff --git a/frontend/src/test/Tokens.test.js b/frontend/src/test/Tokens.test.js
index 49fbba2c..eeb60a73 100644
--- a/frontend/src/test/Tokens.test.js
+++ b/frontend/src/test/Tokens.test.js
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
globalThis.IS_REACT_ACT_ENVIRONMENT = true;
diff --git a/frontend/src/test/UserProfile.test.js b/frontend/src/test/UserProfile.test.js
index 5b8abca0..df5cf591 100644
--- a/frontend/src/test/UserProfile.test.js
+++ b/frontend/src/test/UserProfile.test.js
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
globalThis.IS_REACT_ACT_ENVIRONMENT = true;
diff --git a/frontend/src/test/UserRoleSet.test.js b/frontend/src/test/UserRoleSet.test.js
index 1866fb85..7b0a7e8a 100644
--- a/frontend/src/test/UserRoleSet.test.js
+++ b/frontend/src/test/UserRoleSet.test.js
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
// Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+// of Oxford, and the 'Galv' Developers. All rights reserved.
globalThis.IS_REACT_ACT_ENVIRONMENT = true;
diff --git a/galvanalyser.service b/galvanalyser.service
index 9228fa05..96cdc53e 100644
--- a/galvanalyser.service
+++ b/galvanalyser.service
@@ -1,5 +1,5 @@
[Unit]
-Description=Galvanalyser service with docker compose
+Description=Galv service with docker compose
Requires=docker.service
After=docker.service
diff --git a/harvester/Dockerfile b/harvester/Dockerfile
index 777b686c..e7de3d09 100644
--- a/harvester/Dockerfile
+++ b/harvester/Dockerfile
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: BSD-2-Clause
# Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-# of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+# of Oxford, and the 'Galv' Developers. All rights reserved.
FROM python:3.10.4-slim@sha256:a2e8240faa44748fe18c5b37f83e14101a38dd3f4a1425d18e9e0e913f89b562
diff --git a/harvester/harvester/api.py b/harvester/harvester/api.py
index 7e1a4c62..d366edc1 100644
--- a/harvester/harvester/api.py
+++ b/harvester/harvester/api.py
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: BSD-2-Clause
# Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-# of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+# of Oxford, and the 'Galv' Developers. All rights reserved.
import os
import json
diff --git a/harvester/harvester/harvest.py b/harvester/harvester/harvest.py
index 034dce52..35a26598 100644
--- a/harvester/harvester/harvest.py
+++ b/harvester/harvester/harvest.py
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: BSD-2-Clause
# Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-# of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+# of Oxford, and the 'Galv' Developers. All rights reserved.
import datetime
import os
diff --git a/harvester/harvester/parse/biologic_input_file.py b/harvester/harvester/parse/biologic_input_file.py
index 7461ae3f..6a89aaab 100644
--- a/harvester/harvester/parse/biologic_input_file.py
+++ b/harvester/harvester/parse/biologic_input_file.py
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: BSD-2-Clause
# Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-# of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+# of Oxford, and the 'Galv' Developers. All rights reserved.
import os
import ntpath
diff --git a/harvester/harvester/parse/exceptions.py b/harvester/harvester/parse/exceptions.py
index fef2810b..7096fdc5 100644
--- a/harvester/harvester/parse/exceptions.py
+++ b/harvester/harvester/parse/exceptions.py
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: BSD-2-Clause
# Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-# of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+# of Oxford, and the 'Galv' Developers. All rights reserved.
class UnsupportedFileTypeError(Exception):
"""
diff --git a/harvester/harvester/parse/input_file.py b/harvester/harvester/parse/input_file.py
index 4718d015..9ca57545 100644
--- a/harvester/harvester/parse/input_file.py
+++ b/harvester/harvester/parse/input_file.py
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: BSD-2-Clause
# Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-# of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+# of Oxford, and the 'Galv' Developers. All rights reserved.
from .exceptions import UnsupportedFileTypeError
import traceback
diff --git a/harvester/harvester/parse/ivium_input_file.py b/harvester/harvester/parse/ivium_input_file.py
index 1d0f4610..a660affb 100644
--- a/harvester/harvester/parse/ivium_input_file.py
+++ b/harvester/harvester/parse/ivium_input_file.py
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: BSD-2-Clause
# Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-# of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+# of Oxford, and the 'Galv' Developers. All rights reserved.
import os
import ntpath
diff --git a/harvester/harvester/parse/maccor_input_file.py b/harvester/harvester/parse/maccor_input_file.py
index 7801a525..03c97f40 100644
--- a/harvester/harvester/parse/maccor_input_file.py
+++ b/harvester/harvester/parse/maccor_input_file.py
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: BSD-2-Clause
# Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-# of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+# of Oxford, and the 'Galv' Developers. All rights reserved.
import os
import csv
diff --git a/harvester/harvester/run.py b/harvester/harvester/run.py
index fc004588..3078c253 100644
--- a/harvester/harvester/run.py
+++ b/harvester/harvester/run.py
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: BSD-2-Clause
# Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-# of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+# of Oxford, and the 'Galv' Developers. All rights reserved.
import os.path
import re
diff --git a/harvester/harvester/settings.py b/harvester/harvester/settings.py
index b11c7dba..72e737a8 100644
--- a/harvester/harvester/settings.py
+++ b/harvester/harvester/settings.py
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: BSD-2-Clause
# Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-# of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+# of Oxford, and the 'Galv' Developers. All rights reserved.
import json
import os
diff --git a/harvester/start.py b/harvester/start.py
index cb43d559..05a0cffd 100644
--- a/harvester/start.py
+++ b/harvester/start.py
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: BSD-2-Clause
# Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-# of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+# of Oxford, and the 'Galv' Developers. All rights reserved.
import click
import re
@@ -37,7 +37,7 @@ def append_slash(url: str) -> str:
def get_url() -> str:
- click.echo("Enter the URL for the Galvanalyser server you wish to connect to.")
+ click.echo("Enter the URL for the Galv server you wish to connect to.")
url = input("API URL: ")
return append_slash(url)
diff --git a/harvester/test/test_harvester.py b/harvester/test/test_harvester.py
index e4de6c6f..4764d45f 100644
--- a/harvester/test/test_harvester.py
+++ b/harvester/test/test_harvester.py
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: BSD-2-Clause
# Copyright (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-# of Oxford, and the 'Galvanalyser' Developers. All rights reserved.
+# of Oxford, and the 'Galv' Developers. All rights reserved.
import unittest
from unittest.mock import patch
+ 
+
-[](https://github.com/Battery-Intelligence-Lab/galvanalyser/actions/workflows/unit-test.yml)
-[](https://github.com/Battery-Intelligence-Lab/galvanalyser/actions/workflows/side-effects.yml)
-
- [](https://github.com/Battery-Intelligence-Lab/galvanalyser/actions/workflows/pages/pages-build-deployment)
+[](https://github.com/Battery-Intelligence-Lab/galv/actions/workflows/unit-test.yml)
+[](https://github.com/Battery-Intelligence-Lab/galv/actions/workflows/side-effects.yml)
+
+ [](https://github.com/Battery-Intelligence-Lab/galv/actions/workflows/pages/pages-build-deployment)
-Galvanalyser is a system for automatically storing data generated by battery cycling
+Galv is a system for automatically storing data generated by battery cycling
machines in a database in a standard format.
The project contains several distinct components:
- A REST API
- A Python client for the REST API
- A web frontend for the REST API
-- [Harvesters](https://Battery-Intelligence-Lab.github.io/galvanalyser/UserGuide.html#harvesters) that monitor and process experimental data
+- [Harvesters](https://Battery-Intelligence-Lab.github.io/galv/UserGuide.html#harvesters) that monitor and process experimental data
-A laboratory running a [Galvanalyser server](https://Battery-Intelligence-Lab.github.io/galvanalyser/UserGuide.html#galvanalyser-server) instance and a battery
-cycling machines can use Galvanalyser to make it easy to access, analyse, and
+A laboratory running a [Galv server](https://Battery-Intelligence-Lab.github.io/galv/UserGuide.html#galv-server) instance and a battery
+cycling machines can use Galv to make it easy to access, analyse, and
share their experimental data.
To do this, they:
1. Set the cycling machines up to output their raw test result files to a shared drive.
-2. Set up a [harvester](https://Battery-Intelligence-Lab.github.io/galvanalyser/UserGuide.html#harvesters) on a computer with access to that shared drive.
+2. Set up a [harvester](https://Battery-Intelligence-Lab.github.io/galv/UserGuide.html#harvesters) on a computer with access to that shared drive.
- (This only needs to be done once)
-3. Log into their lab [Web frontend](https://Battery-Intelligence-Lab.github.io/galvanalyser/UserGuide.html#web-frontend) and configure the
- [harvester](https://Battery-Intelligence-Lab.github.io/galvanalyser/UserGuide.html#harvesters) to crawl the appropriate directories on the shared drive.
-4. Log into the [Web frontend](https://Battery-Intelligence-Lab.github.io/galvanalyser/UserGuide.html#web-frontend) to edit metadata and view data,
- or use the [Python client](https://Battery-Intelligence-Lab.github.io/galvanalyser/UserGuide.html#python-client) to download formatted data for analysis.
+3. Log into their lab [Web frontend](https://Battery-Intelligence-Lab.github.io/galv/UserGuide.html#web-frontend) and configure the
+ [harvester](https://Battery-Intelligence-Lab.github.io/galv/UserGuide.html#harvesters) to crawl the appropriate directories on the shared drive.
+4. Log into the [Web frontend](https://Battery-Intelligence-Lab.github.io/galv/UserGuide.html#web-frontend) to edit metadata and view data,
+ or use the [Python client](https://Battery-Intelligence-Lab.github.io/galv/UserGuide.html#python-client) to download formatted data for analysis.
The harvesters are able to parse the following file types:
@@ -36,21 +36,21 @@ The harvesters are able to parse the following file types:
The server database is a relational database that stores each dataset along with information
about column types, units, and other relevant metadata (e.g. cell information, owner, purpose
of the experiment).
-The [REST API](https://Battery-Intelligence-Lab.github.io/galvanalyser/UserGuide.html#rest-api) provides its own definition via a downloadable OpenAPI schema file
+The [REST API](https://Battery-Intelligence-Lab.github.io/galv/UserGuide.html#rest-api) provides its own definition via a downloadable OpenAPI schema file
(`schema/`), and provides interactive documentation via SwaggerUI (`schema/swagger-ui/`) and
Redoc (`schema/redoc/`).
-The schema can be downloaded from the [documentation page](https://Battery-Intelligence-Lab.github.io/galvanalyser/UserGuide.html#api-spec).
+The schema can be downloaded from the [documentation page](https://Battery-Intelligence-Lab.github.io/galv/UserGuide.html#api-spec).
A diagram of the logical structure of the system is shown below. The arrows indicate the
direction of data flow.