Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/pip/black-23.12.1
Browse files Browse the repository at this point in the history
  • Loading branch information
alexhad6 authored Jan 3, 2024
2 parents e135331 + b9f4851 commit f97c4a0
Show file tree
Hide file tree
Showing 7 changed files with 272 additions and 267 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,15 @@ jobs:
- name: Start E2E server
run: poetry run python tests/e2e/start_server.py &

- name: Ensure E2E server is up
run: yarn wait-on http://127.0.0.1:5051 -t 1000

- name: E2E tests
run: poetry run pytest tests/e2e

- name: Upload failure screenshots
uses: actions/upload-artifact@v3
- name: Upload failure traces
uses: actions/upload-artifact@v4
if: failure()
with:
name: e2e-failed-traces
name: e2e-failure-traces
path: test-results
4 changes: 2 additions & 2 deletions .github/workflows/github-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
run: mv dist/* _site/releases/${{ env.PACKAGE_NAME }}

- name: Upload site artifact
uses: actions/upload-pages-artifact@v2
uses: actions/upload-pages-artifact@v3

deploy:
needs: build
Expand All @@ -94,4 +94,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v3
uses: actions/deploy-pages@v4
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BSD 3-Clause License

Copyright (c) 2023, California Institute of Technology
Copyright (c) 2023–2024, California Institute of Technology

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
Expand Down
36 changes: 18 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,47 +12,47 @@
},
"packageManager": "[email protected]",
"dependencies": {
"@emotion/react": "^11.11.1",
"@emotion/react": "^11.11.3",
"@emotion/styled": "^11.11.0",
"@fontsource/roboto": "^5.0.8",
"@mui/icons-material": "^5.14.19",
"@mui/lab": "^5.0.0-alpha.155",
"@mui/material": "^5.14.20",
"@mui/icons-material": "^5.15.3",
"@mui/lab": "^5.0.0-alpha.159",
"@mui/material": "^5.15.3",
"deep-object-diff": "^1.1.9",
"fast-deep-equal": "^3.1.3",
"jotai": "^2.6.0",
"jotai": "^2.6.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-error-boundary": "^4.0.11",
"react-error-boundary": "^4.0.12",
"react-window": "^1.8.10",
"socket.io-client": "^4.7.2"
"socket.io-client": "^4.7.3"
},
"devDependencies": {
"@swc/core": "^1.3.100",
"@swc/core": "^1.3.102",
"@swc/jest": "^0.2.29",
"@types/jest": "^29.5.11",
"@types/node": "^20.10.4",
"@types/react": "^18.2.42",
"@types/react-dom": "^18.2.17",
"@types/node": "^20.10.6",
"@types/react": "^18.2.46",
"@types/react-dom": "^18.2.18",
"@types/react-window": "^1.8.8",
"@typescript-eslint/eslint-plugin": "^6.17.0",
"@typescript-eslint/parser": "^6.17.0",
"@vitejs/plugin-react-swc": "^3.5.0",
"eslint": "^8.55.0",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-jest": "^27.6.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jest": "^27.6.1",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"prettier": "^3.1.0",
"ts-node": "^10.9.1",
"prettier": "^3.1.1",
"ts-node": "^10.9.2",
"typescript": "^5.3.3",
"vite": "^5.0.7",
"vite": "^5.0.10",
"wait-on": "^7.2.0",
"whatwg-fetch": "^3.6.19"
"whatwg-fetch": "^3.6.20"
}
}
Loading

0 comments on commit f97c4a0

Please sign in to comment.