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

updates #131

Merged
merged 23 commits into from
Dec 23, 2024
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
uv
alex-treebeard committed Dec 23, 2024
commit c659d85127ce5fd40323a4d5d1f8fede9597e3cd
1 change: 0 additions & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -6,6 +6,5 @@ ARG NODE_VERSION="lts/*"
RUN if [ "${INSTALL_NODE}" = "true" ]; then su vscode -c "source /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
USER vscode
RUN pip3 --disable-pip-version-check --no-cache-dir install -U \
'poetry==1.8.3' \
'pip==22.1.2'
RUN npm install -g @devcontainers/[email protected]
1 change: 0 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -23,6 +23,5 @@
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {}
},
"postCreateCommand": "poetry install",
"remoteUser": "vscode"
}
1 change: 0 additions & 1 deletion .devcontainer/vm/Dockerfile
Original file line number Diff line number Diff line change
@@ -6,6 +6,5 @@ ARG NODE_VERSION="lts/*"
RUN if [ "${INSTALL_NODE}" = "true" ]; then su vscode -c "source /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
USER vscode
RUN pip3 --disable-pip-version-check --no-cache-dir install -U \
'poetry==1.8.3' \
'pip==22.1.2'
RUN npm install -g @devcontainers/[email protected]
9 changes: 1 addition & 8 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -24,15 +24,8 @@ repos:
hooks:
- id: pyright
name: pyright
entry: poetry run pyright
entry: uv run pyright
language: node
pass_filenames: false
types: [python]
additional_dependencies: ["[email protected]"]
# - repo: local
# hooks:
# - id: smoketest
# name: smoketest
# entry: poetry run pytest -k test_when_nb_present_then_collected
# language: system
# pass_filenames: false
10 changes: 0 additions & 10 deletions CONTRIBUTING.MD
Original file line number Diff line number Diff line change
@@ -5,16 +5,6 @@ nbmake uses devcontainers to pre-configure a dev environment. We recommend you o

For non-vscode users, here are some install steps:

### Install local package
```
poetry install
```

### Activate shell
```
poetry shell
```

### Run static checks
```
pre-commit run --all-files
1,475 changes: 0 additions & 1,475 deletions poetry.lock

This file was deleted.

3 changes: 0 additions & 3 deletions poetry.toml

This file was deleted.

6 changes: 6 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -25,3 +25,9 @@ Homepage = "https://github.com/treebeardtech/nbmake"
[build-system]
requires = ["setuptools>=65.0.0", "wheel"]
build-backend = "setuptools.build_meta"

[dependency-groups]
dev = [
"pre-commit>=3.5.0",
"ruff>=0.8.4",
]
9 changes: 5 additions & 4 deletions scripts/init.sh
Original file line number Diff line number Diff line change
@@ -5,8 +5,9 @@ set +x

export PIP_USER=no

pip install poetry
pipx install uv

poetry install
poetry run pre-commit run -a
poetry run pre-commit install
uv venv --python 3.11.6
uv pip install -e .
uv run pre-commit run -a
uv run pre-commit install
1,406 changes: 1,406 additions & 0 deletions uv.lock

Large diffs are not rendered by default.