Skip to content

Commit

Permalink
Merge branch 'fix-embargo' of https://github.com/NeurodataWithoutBord…
Browse files Browse the repository at this point in the history
…ers/nwb-guide into fix-embargo
  • Loading branch information
garrettmflynn committed Jun 5, 2024
2 parents 775b636 + ef4c9d7 commit 68d974b
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "nwb-guide",
"productName": "NWB GUIDE",
"version": "0.0.16",
"version": "1.0.0",
"description": "NWB GUIDE is a desktop app that provides a no-code user interface for converting neurophysiology data to NWB.",
"main": "./build/main/index.js",
"engine": {
Expand Down
2 changes: 1 addition & 1 deletion src/electron/frontend/core/components/DandiResults.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export class DandiResults extends LitElement {
const type = staging ? "staging" : undefined;
const api_key = await getAPIKey.call(this, staging);

const dandiset = await get(this.id, {
const dandiset = await get(this.id, {
type,
token: api_key,
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ export class GuidedUploadPage extends Page {
},
onUpdate: () => (this.unsavedUpdates = true),
onThrow,
validateOnChange: (...args) => validate.call(this, ...args)
validateOnChange: (...args) => validate.call(this, ...args),
}));
})
.catch((error) => html`<p>${error}</p>`);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ export class UploadsPage extends Page {
error.message = "Please select at least one file or folder to upload.";
},

validateOnChange: (...args) => validate.call(this, ...args)
validateOnChange: (...args) => validate.call(this, ...args),
}));
})
.catch((error) => html`<p>${error}</p>`);
Expand Down
6 changes: 3 additions & 3 deletions src/electron/frontend/core/components/pages/uploads/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ function isNumeric(str: string) {
const staging = isStaging(value)
const type = staging ? "staging" : undefined;
const token = await getAPIKey.call(this, staging);
const dandiset = await get(value, {

const dandiset = await get(value, {
type,
token
})
Expand Down Expand Up @@ -96,7 +96,7 @@ export function awardNumberValidator(awardNumber: string): boolean {
export const AWARD_VALIDATION_FAIL_MESSAGE = 'Award number must be properly space-delimited.\n\nExample (exclude quotes):\n"1 R01 CA 123456-01A1"';


// this:
// this:
export async function getAPIKey(
// this: Page,
staging = false
Expand Down
5 changes: 2 additions & 3 deletions src/pyflask/manageNeuroconv/manage_neuroconv.py
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,7 @@ def validate_subject_metadata(
subject_metadata["date_of_birth"] = datetime.fromisoformat(subject_metadata["date_of_birth"])
if timezone is not None:
subject_metadata["date_of_birth"] = subject_metadata["date_of_birth"].replace(
tzinfo=pytz.timezone(timezone)
tzinfo=zoneinfo.ZoneInfo(timezone)
)

return run_check_function(check_function, Subject(**subject_metadata))
Expand All @@ -672,7 +672,6 @@ def validate_nwbfile_metadata(
nwbfile_metadata: dict, check_function_name: str, timezone: Optional[str] = None
): # -> Union[None, InspectorMessage, List[InspectorMessage]]:
"""Function used to validate NWBFile metadata."""
import pytz
from pynwb.testing.mock.file import mock_NWBFile

check_function = get_check_function(check_function_name)
Expand All @@ -681,7 +680,7 @@ def validate_nwbfile_metadata(
nwbfile_metadata["session_start_time"] = datetime.fromisoformat(nwbfile_metadata["session_start_time"])
if timezone is not None:
nwbfile_metadata["session_start_time"] = nwbfile_metadata["session_start_time"].replace(
tzinfo=pytz.timezone(timezone)
tzinfo=zoneinfo.ZoneInfo(timezone)
)

return run_check_function(check_function, mock_NWBFile(**nwbfile_metadata))
Expand Down

0 comments on commit 68d974b

Please sign in to comment.