Skip to content
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
2 changes: 1 addition & 1 deletion .devcontainer/dev-with-python/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

"mounts": ["source=${localWorkspaceFolder},target=/workspaces/local,type=bind,consistency=cached"],
// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "npm ci",
// "postCreateCommand": "npm install",
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
"remoteUser": "vscode"
}
2 changes: 1 addition & 1 deletion .devcontainer/dev/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"mounts": ["source=${localWorkspaceFolder},target=/workspaces/local,type=bind,consistency=cached"]
// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "npm ci",
// "postCreateCommand": "npm install",
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
// , "remoteUser": "vscode"
}
17 changes: 7 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ on:
branches: [main]
workflow_dispatch:

env:
NODE_VERSION: 22.x

permissions:
actions: read
contents: read
Expand All @@ -32,7 +29,7 @@ jobs:
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
with:
cache: 'npm'
node-version: ${{ env.NODE_VERSION }}
node-version-file: '.nvmrc'
registry-url: 'https://npm.pkg.github.com'
scope: '@deepnote'

Expand All @@ -59,7 +56,7 @@ jobs:
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
with:
cache: 'npm'
node-version: ${{ env.NODE_VERSION }}
node-version-file: '.nvmrc'
registry-url: 'https://npm.pkg.github.com'
scope: '@deepnote'

Expand Down Expand Up @@ -107,7 +104,7 @@ jobs:
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
with:
cache: 'npm'
node-version: ${{ env.NODE_VERSION }}
node-version-file: '.nvmrc'
registry-url: 'https://npm.pkg.github.com'
scope: '@deepnote'

Expand Down Expand Up @@ -157,7 +154,7 @@ jobs:
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
with:
cache: 'npm'
node-version: ${{ env.NODE_VERSION }}
node-version-file: '.nvmrc'
registry-url: 'https://npm.pkg.github.com'
scope: '@deepnote'

Expand All @@ -181,7 +178,7 @@ jobs:
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
with:
cache: 'npm'
node-version: ${{ env.NODE_VERSION }}
node-version-file: '.nvmrc'
registry-url: 'https://npm.pkg.github.com'
scope: '@deepnote'

Expand All @@ -205,7 +202,7 @@ jobs:
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
with:
cache: 'npm'
node-version: ${{ env.NODE_VERSION }}
node-version-file: '.nvmrc'
registry-url: 'https://npm.pkg.github.com'
scope: '@deepnote'

Expand All @@ -229,7 +226,7 @@ jobs:
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
with:
cache: 'npm'
node-version: ${{ env.NODE_VERSION }}
node-version-file: '.nvmrc'
registry-url: 'https://npm.pkg.github.com'
scope: '@deepnote'

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/copilot-setup-steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ on:
- .github/workflows/copilot-setup-steps.yml

env:
NODE_VERSION: 22.15.1
NPM_VERSION: 10.9.2
PYTHON_VERSION: 3.12
DENO_VERSION: '~1.37'
Expand Down Expand Up @@ -42,7 +41,7 @@ jobs:
- name: Use Node ${{env.NODE_VERSION}}
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
with:
node-version: ${{env.NODE_VERSION}}
node-version-file: '.nvmrc'
registry-url: 'https://npm.pkg.github.com'
scope: '@deepnote'

Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ on:
- cron: '0 9 * * 1'
workflow_dispatch:

env:
NODE_VERSION: 22.x

permissions:
actions: read
contents: read
Expand All @@ -30,7 +27,7 @@ jobs:
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
with:
cache: 'npm'
node-version: ${{ env.NODE_VERSION }}
node-version-file: '.nvmrc'
registry-url: 'https://npm.pkg.github.com'
scope: '@deepnote'

Expand Down Expand Up @@ -62,7 +59,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
with:
node-version: ${{ env.NODE_VERSION }}
node-version-file: '.nvmrc'
cache: 'npm'

- name: Install dependencies
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ on:
branches: [main]
workflow_dispatch:

env:
NODE_VERSION: 22.x

permissions:
contents: read
packages: read
Expand All @@ -31,7 +28,7 @@ jobs:
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
with:
cache: 'npm'
node-version: ${{ env.NODE_VERSION }}
node-version-file: '.nvmrc'
registry-url: 'https://npm.pkg.github.com'
scope: '@deepnote'

Expand Down
2 changes: 1 addition & 1 deletion .husky/post-checkout
Original file line number Diff line number Diff line change
@@ -1 +1 @@
npm ci
npm install
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ The `@deepnote/blocks` package is published on GitHub Packages. To install it, y
```
Replace `YOUR_TOKEN_HERE` with your actual token.

After completing these steps, you can install dependencies normally with `npm ci`. The project's `.npmrc` file is already configured to use GitHub Packages for the `@deepnote` scope.
After completing these steps, you can install dependencies normally with `npm install`. The project's `.npmrc` file is already configured to use GitHub Packages for the `@deepnote` scope.

On Apple Silicon, you will have to use system versions of `libsodium` and `libzmq` instead of the bundled ones:

Expand All @@ -78,7 +78,7 @@ npm_config_build_from_source=true npm install zeromq@
Install the dependecies:

```shell
npm ci
npm install
# Run this to setup the necessary pre-commit hooks.
npm run setup-precommit-hook
python3 -m venv .venv
Expand Down Expand Up @@ -277,7 +277,7 @@ Here's an example of a typical workflow:

1. Sync to main (get your fork's main to match vscode-jupyter's main)
1. Create branch
1. `npm ci`
1. `npm install`
1. `npm run clean`
1. Start VS code Insiders root
1. CTRL+SHIFT+B (run the task `compile`)
Expand Down Expand Up @@ -354,7 +354,7 @@ Steps to build the extension on your machine once you've cloned the repo:
```bash
> npm install -g @vscode/vsce
# Perform the next steps in the vscode-jupyter folder.
> npm ci
> npm install
> npm run clean
> npm run package # This step takes around 10 minutes.
```
Expand Down