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 CI, upgrade dependencies #152

Merged
merged 3 commits into from
Dec 5, 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
53 changes: 11 additions & 42 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ parameters:

- task: NodeTool@0
inputs:
versionSpec: '12.x'
versionSpec: '16.x'

- bash: npm install -g yarn
displayName: 'Install Yarn'
Expand Down Expand Up @@ -205,48 +205,17 @@ jobs:
- ${{ parameters.initSteps }}
- ${{ parameters.testPythonSteps }}

- job: 'python__mac'
pool:
vmImage: 'macOS-latest'
variables:
python.version: '3.7'

steps:
- ${{ parameters.initDockerMacSteps }}
- ${{ parameters.pullContainersSteps }}
- ${{ parameters.initSteps }}
- ${{ parameters.testPythonSteps }}

# TODO: delete this duplicate job, once the required test has been renamed on github: "Linux Python37" => "python__linux"
- job: 'Linux'
pool:
vmImage: 'ubuntu-latest'
strategy:
matrix:
Python37:
python.version: '3.7'

steps:
- ${{ parameters.initDockerSteps }}
- ${{ parameters.pullContainersSteps }}
- ${{ parameters.initSteps }}
- ${{ parameters.testPythonSteps }}

# TODO: delete this duplicate job, once the required test has been renamed on github: "Mac Python37" => "python__mac"
- job: 'Mac'
pool:
vmImage: 'macOS-latest'
strategy:
matrix:
Python37:
python.version: '3.7'

steps:
- ${{ parameters.initDockerMacSteps }}
- ${{ parameters.pullContainersSteps }}
- ${{ parameters.initSteps }}
- ${{ parameters.testPythonSteps }}
# - job: 'python__mac'
# pool:
# vmImage: 'macOS-latest'
# variables:
# python.version: '3.7'

# steps:
# - ${{ parameters.initDockerMacSteps }}
# - ${{ parameters.pullContainersSteps }}
# - ${{ parameters.initSteps }}
# - ${{ parameters.testPythonSteps }}

# - job: 'Windows'
# pool:
Expand Down
15 changes: 9 additions & 6 deletions js/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
module.exports = {
preset: "ts-jest/presets/js-with-babel",
transform: {
"\\.svg$": "jest-raw-loader",
},
moduleNameMapper: {
"\\.(css|less|sass|scss)$": "<rootDir>/tests/styleMock.js",
"\\.(jpg|jpeg|png|gif|eot)$": "<rootDir>/tests/fileMock.js",
"\\.(jpg|jpeg|png|gif|eot|svg)$": "<rootDir>/tests/fileMock.js",
},
moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
moduleFileExtensions: ["ts", "tsx", "js"],
testPathIgnorePatterns: ["/lib/", "/node_modules/"],
testRegex: "tests\/.*\.test\.ts[x]?$", // eslint-disable-line no-useless-escape
transformIgnorePatterns: ["/node_modules/(?!(@jupyterlab/.*)|(tree-finder)/)"],
transform: {
"\\.tsx?$": "ts-jest",
"\\.jsx?$": "babel-jest",
},
transformIgnorePatterns: [
"node_modules/(?!@jupyterlab|tree-finder)"
],
globals: {
"ts-jest": {
// in tsconfig.test.json, rootDir is parent of both tests and src dirs
Expand Down
38 changes: 19 additions & 19 deletions js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,31 +63,31 @@
},
"devDependencies": {
"@babel/core": "^7.0.0",
"@babel/preset-env": "^7.7.6",
"@babel/preset-env": "^7.20.2",
"@jupyterlab/builder": "^3.0.0",
"@types/jest": "^26.0.22",
"@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0",
"@typescript-eslint/eslint-plugin": "^4.26.0",
"@typescript-eslint/parser": "^4.26.0",
"eslint": "^7.0.0",
"@typescript-eslint/eslint-plugin": "^5.45.0",
"@typescript-eslint/parser": "^5.45.0",
"eslint": "^8.29.0",
"eslint-plugin-import": "^2.23.4",
"eslint-plugin-jsdoc": "^35.1.2",
"eslint-plugin-jsdoc": "^39.6.4",
"eslint-plugin-prefer-arrow": "^1.2.3",
"eslint-plugin-react": "^7.24.0",
"eslint-plugin-unicorn": "^33.0.0",
"isomorphic-fetch": "^2.2.1",
"jest": "^26.6.3",
"eslint-plugin-unicorn": "^45.0.1",
"isomorphic-fetch": "^3.0.0",
"jest": "^26",
"jest-raw-loader": "^1.0.1",
"mkdirp": "^0.5.1",
"rimraf": "^2.7.1",
"mkdirp": "^1.0.4",
"rimraf": "^3.0.2",
"shx": "^0.3.3",
"ts-jest": "^26.5.4",
"typescript": "^4.2.4",
"yarn-deduplicate": "^3.1.0"
"yarn-deduplicate": "^6.0.0"
},
"resolutions": {
"**/@types/react": "^17.0.0"
"**/@types/react": "^17.0.0"
},
"sideEffects": [
"style/**/*.css",
Expand All @@ -96,14 +96,14 @@
"styleModule": "style/index.js",
"jupyterlab": {
"discovery": {
"server": {
"managers": [
"pip"
],
"base": {
"name": "jupyter-fs"
}
"server": {
"managers": [
"pip"
],
"base": {
"name": "jupyter-fs"
}
}
},
"extension": true,
"outputDir": "../jupyterfs/labextension",
Expand Down
Loading