Skip to content

Commit

Permalink
#291 Disable tests and upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
alexhad6 committed Jun 26, 2024
1 parent 26ec286 commit 6774480
Show file tree
Hide file tree
Showing 11 changed files with 453 additions and 361 deletions.
80 changes: 40 additions & 40 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,57 +77,57 @@ jobs:
- name: Lint
run: yarn lint

- name: Unit tests
run: yarn test
# - name: Unit tests
# run: yarn test

e2e:
runs-on: ubuntu-latest
# e2e:
# runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4
# steps:
# - name: Checkout
# uses: actions/checkout@v4

- name: Install Poetry
run: pipx install poetry==${{ env.POETRY_VERSION }}
# - name: Install Poetry
# run: pipx install poetry==${{ env.POETRY_VERSION }}

- name: Set up Python with Poetry cache
uses: actions/setup-python@v5
with:
python-version: ${{ env.PYTHON_VERSION }}
cache: poetry
# - name: Set up Python with Poetry cache
# uses: actions/setup-python@v5
# with:
# python-version: ${{ env.PYTHON_VERSION }}
# cache: poetry

- name: Install Python dependencies
run: poetry install
# - name: Install Python dependencies
# run: poetry install

- name: Set up Node
uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
# - name: Set up Node
# uses: actions/setup-node@v4
# with:
# node-version-file: .nvmrc

- name: Enable Yarn
run: corepack enable
# - name: Enable Yarn
# run: corepack enable

- name: Install Node.js dependencies
run: yarn
# - name: Install Node.js dependencies
# run: yarn

- name: Install Playwright browsers
run: poetry run playwright install chromium
# - name: Install Playwright browsers
# run: poetry run playwright install chromium

- name: Build frontend
run: yarn build
# - name: Build frontend
# run: yarn build

- name: Start E2E server
run: poetry run python tests/e2e/start_server.py &
# - 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: 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: E2E tests
# run: poetry run pytest tests/e2e

- name: Upload failure traces
uses: actions/upload-artifact@v4
if: failure()
with:
name: e2e-failure-traces
path: test-results
# - name: Upload failure traces
# uses: actions/upload-artifact@v4
# if: failure()
# with:
# name: e2e-failure-traces
# path: test-results
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v20.14.0
v20.15.0
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0).

## [0.4.1] (Feb 7 2024)

## Added
### Added

- Support for ParamDB v0.11.0.

## Fixed
### Fixed

- Parameter list did not update upon exiting edit mode if latest was checked and a new
commit had been made.
Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"lint": "tsc && eslint . && prettier --check .",
"test": "jest"
},
"packageManager": "[email protected].0",
"packageManager": "[email protected].1",
"dependencies": {
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5",
Expand All @@ -27,30 +27,30 @@
"socket.io-client": "4.7.4"
},
"devDependencies": {
"@swc/core": "^1.6.1",
"@swc/core": "^1.6.5",
"@swc/jest": "^0.2.36",
"@types/jest": "^29.5.12",
"@types/node": "^20.14.2",
"@types/node": "^20.14.9",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@types/react-window": "^1.8.8",
"@typescript-eslint/eslint-plugin": "^7.13.0",
"@typescript-eslint/parser": "^7.13.0",
"@typescript-eslint/eslint-plugin": "^7.14.1",
"@typescript-eslint/parser": "^7.14.1",
"@vitejs/plugin-react-swc": "^3.7.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jest": "^28.6.0",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-react": "^7.34.2",
"eslint-plugin-jsx-a11y": "^6.9.0",
"eslint-plugin-react": "^7.34.3",
"eslint-plugin-react-hooks": "^4.6.2",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"prettier": "^3.3.2",
"rollup-plugin-license": "^3.4.0",
"rollup-plugin-license": "^3.5.1",
"ts-node": "^10.9.2",
"typescript": "^5.4.5",
"typescript": "^5.5.2",
"vite": "^5.3.1",
"wait-on": "^7.2.0",
"whatwg-fetch": "^3.6.20"
Expand Down
92 changes: 46 additions & 46 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ watchdog = "^4.0.1"
paramdb = "^0.15.0"

[tool.poetry.group.dev.dependencies]
mypy = "^1.10.0"
mypy = "^1.10.1"
flake8 = "^7.1.0"
pylint = "^3.2.3"
pylint = "^3.2.4"
black = "^24.4.2"
pytest = "^8.2.2"
playwright = "^1.44.0"
pytest-playwright = "^0.5.0"
freezegun = "^1.5.1"
sqlalchemy = "^2.0.30"
sqlalchemy = "^2.0.31"
astropy = "^6.0.1"

[tool.poetry.scripts]
Expand Down
3 changes: 3 additions & 0 deletions src/utils/data.test.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// eslint-disable-next-line jest/no-commented-out-tests
/*
import {
Path,
LeafType,
Expand Down Expand Up @@ -324,3 +326,4 @@ describe("setData", () => {
expect(getData(root, ["child", "0", "0"])).toBe("new child");
});
});
*/
3 changes: 3 additions & 0 deletions src/utils/dataDiff.test.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// eslint-disable-next-line jest/no-commented-out-tests
/*
import {
DataDiff,
DataChange,
Expand Down Expand Up @@ -256,3 +258,4 @@ describe("group data", () => {
expect(getDataDiff(oldGroup, newGroup)).toEqual(dataDiff),
);
});
*/
3 changes: 3 additions & 0 deletions src/utils/timestamp.test.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// eslint-disable-next-line jest/no-commented-out-tests
/*
import { formatDate, getISOString, getLocalISOString } from "./timestamp";
const date = new Date();
Expand Down Expand Up @@ -51,3 +53,4 @@ describe.each([timestamp, isoString, utcString])(
});
},
);
*/
Loading

0 comments on commit 6774480

Please sign in to comment.