Skip to content

Commit

Permalink
Merge pull request #42 from waldiez/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
lazToum authored Dec 14, 2024
2 parents 1b17848 + 34055ba commit 7a56901
Show file tree
Hide file tree
Showing 13 changed files with 893 additions and 1,143 deletions.
3 changes: 3 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"recommendations": ["waldiez.waldiez-vscode"]
}
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"adduser",
"Adleman",
"Adrien",
"agentchat",
"agnesi",
"albattani",
"Alekseyevich",
Expand Down Expand Up @@ -212,6 +213,7 @@
"logconsole",
"lumino",
"mainmenu",
"makedirs",
"Margulis",
"Maryam",
"Matsumoto",
Expand Down Expand Up @@ -362,6 +364,7 @@
"xdist",
"xunit",
"xyflow",
"yarnrc",
"ydoc",
"yfinance"
]
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

## [unreleased]

## v0.1.18

- Updated waldiez to v0.1.17
- Updated @waldiez/react to v0.1.20
- Updated other js dependencies
- Updated other py dependencies

## v0.1.17

- Updated @waldiez/react to v0.1.18
Expand Down
12 changes: 3 additions & 9 deletions Containerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ RUN pip3 install --break-system-packages -r /tmp/requirements.txt && \
# specify the js branch to use
ARG JS_DEV_BRANCH=dev

RUN git clone https://github.com/waldiez/react -b $JS_DEV_BRANCH
RUN git clone https://github.com/waldiez/react.git -b $JS_DEV_BRANCH
WORKDIR /tmp/package/react
RUN yarn install && \
yarn build:lib && \
Expand All @@ -58,14 +58,8 @@ RUN jlpm install && \
jlpm build:lib:prod && \
jlpm build:prod

# specify the py branch to use
ARG PY_DEV_BRANCH=dev

# build the python package
RUN uv sync && \
uv remove waldiez && \
uv add waldiez@git+https://github.com/waldiez/py.git@$PY_DEV_BRANCH && \
python3 -m build
RUN uv sync && python3 -m build

#####################################################################################
# Final image
Expand Down Expand Up @@ -146,7 +140,7 @@ ARG PY_DEV_BRANCH=dev
COPY --from=builder --chown=user:user /tmp/package/waldiez_jupyter/dist/*.whl /home/user/tmp/
RUN pip install --user /home/user/tmp/*.whl && \
pip uninstall -y waldiez autogen-agentchat && \
pip install git+https://github.com/waldiez/py.git@$PY_DEV_BRANCH && \
pip install --user git+https://github.com/waldiez/waldiez.git@$PY_DEV_BRANCH && \
rm -rf /home/user/tmp

RUN mkdir -p /home/user/.local/share/jupyter/lab/settings && \
Expand Down
15 changes: 15 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Security Policy

## Supported Versions

The following versions are currently supported with security updates:

| Version | Supported |
| ------- | ------------------ |
| 0.1.x | :white_check_mark: |

## Reporting a Vulnerability

Please report security issues by emailing `development @ waldiez.io` .

The project maintainers will then work with you to resolve any issues where required, prior to any public disclosure.
52 changes: 26 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@waldiez/jupyter",
"version": "0.1.17",
"version": "0.1.18",
"description": "A Waldiez JupyterLab extension.",
"keywords": [
"waldiez",
Expand Down Expand Up @@ -71,39 +71,39 @@
"dependencies": {
"@jupyter-widgets/base": "^6.0.10",
"@jupyter-widgets/jupyterlab-manager": "^5.0.13",
"@jupyterlab/application": "^4.3.2",
"@jupyterlab/cells": "^4.3.2",
"@jupyterlab/codeeditor": "^4.3.2",
"@jupyterlab/coreutils": "^6.3.2",
"@jupyterlab/docregistry": "^4.3.2",
"@jupyterlab/fileeditor": "^4.3.2",
"@jupyterlab/launcher": "^4.3.2",
"@jupyterlab/logconsole": "^4.3.2",
"@jupyterlab/mainmenu": "^4.3.2",
"@jupyterlab/notebook": "^4.3.2",
"@jupyterlab/rendermime": "^4.3.2",
"@jupyterlab/services": "^7.3.2",
"@jupyterlab/settingregistry": "^4.3.2",
"@jupyterlab/ui-components": "^4.3.2",
"@jupyterlab/ui-components-extension": "^4.3.2",
"@jupyterlab/application": "^4.3.3",
"@jupyterlab/cells": "^4.3.3",
"@jupyterlab/codeeditor": "^4.3.3",
"@jupyterlab/coreutils": "^6.3.3",
"@jupyterlab/docregistry": "^4.3.3",
"@jupyterlab/fileeditor": "^4.3.3",
"@jupyterlab/launcher": "^4.3.3",
"@jupyterlab/logconsole": "^4.3.3",
"@jupyterlab/mainmenu": "^4.3.3",
"@jupyterlab/notebook": "^4.3.3",
"@jupyterlab/rendermime": "^4.3.3",
"@jupyterlab/services": "^7.3.3",
"@jupyterlab/settingregistry": "^4.3.3",
"@jupyterlab/ui-components": "^4.3.3",
"@jupyterlab/ui-components-extension": "^4.3.3",
"@lumino/algorithm": "^2.0.2",
"@lumino/widgets": "^2.5.0",
"@waldiez/react": "0.1.18"
"@waldiez/react": "^0.1.20"
},
"devDependencies": {
"@jest/globals": "^29.7.0",
"@jupyterlab/builder": "^4.3.2",
"@jupyterlab/testutils": "^4.3.2",
"@stylistic/eslint-plugin": "^2.11.0",
"@jupyterlab/builder": "^4.3.3",
"@jupyterlab/testutils": "^4.3.3",
"@stylistic/eslint-plugin": "^2.12.1",
"@testing-library/react": "^16.1.0",
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@trivago/prettier-plugin-sort-imports": "^5.2.0",
"@types/jest": "^29.5.14",
"@types/json-schema": "^7.0.15",
"@types/node": "^22.10.1",
"@types/react": "^18.3.14",
"@types/node": "^22.10.2",
"@types/react": "^18.3.16",
"@types/react-addons-linked-state-mixin": "^0.14.27",
"@typescript-eslint/eslint-plugin": "^8.17.0",
"@typescript-eslint/parser": "^8.17.0",
"@typescript-eslint/eslint-plugin": "^8.18.0",
"@typescript-eslint/parser": "^8.18.0",
"add": "^2.0.6",
"copyfiles": "^2.4.1",
"css-loader": "^7.1.2",
Expand All @@ -126,7 +126,7 @@
"stylelint-prettier": "^5.0.2",
"ts-jest": "^29.2.5",
"typescript": "~5.7.2",
"typescript-eslint": "^8.17.0",
"typescript-eslint": "^8.18.0",
"yarn-deduplicate": "^6.0.2",
"yjs": "^13.6.20"
},
Expand Down
7 changes: 4 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ classifiers = [
dependencies = [
"jupyter_server>=2.0.1,<3",
"pathvalidate==3.2.1",
"waldiez==0.1.14",
"waldiez==0.1.17",
]
dynamic = ["version", "description", "authors", "urls", "keywords"]
[project.optional-dependencies]
Expand All @@ -44,15 +44,16 @@ dev = [
'black[jupyter]==24.10.0',
'flake8==7.1.1',
'isort==5.13.2',
'jupyterlab==4.3.2',
'jupyterlab==4.3.3',
'mypy==1.13.0',
'pre-commit==4.0.1',
'pydocstyle==6.3.0',
'pylint==3.3.2',
'python-dotenv==1.0.1',
'ruff==0.8.2',
'ruff==0.8.3',
'toml==0.10.2',
'types-PyYAML==6.0.12.20240917',
'toml; python_version <= "3.10"',
'types-toml==0.10.8.20240310',
'yamllint==1.35.1',
]
Expand Down
34 changes: 6 additions & 28 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,40 +1,18 @@
# This file was autogenerated by uv via the following command:
# uv pip compile pyproject.toml --output-file requirements/dev.txt --extra=dev --no-deps
-r main.txt
autoflake==2.3.1
# via waldiez-jupyter (pyproject.toml)
bandit==1.8.0
# via waldiez-jupyter (pyproject.toml)
black==24.10.0
# via waldiez-jupyter (pyproject.toml)
black[jupyter]==24.10.0
flake8==7.1.1
# via waldiez-jupyter (pyproject.toml)
isort==5.13.2
# via waldiez-jupyter (pyproject.toml)
jupyter-server==2.14.2
# via waldiez-jupyter (pyproject.toml)
jupyterlab==4.3.2
# via waldiez-jupyter (pyproject.toml)
jupyterlab==4.3.3
mypy==1.13.0
# via waldiez-jupyter (pyproject.toml)
pathvalidate==3.2.1
# via waldiez-jupyter (pyproject.toml)
pre-commit==4.0.1
# via waldiez-jupyter (pyproject.toml)
pydocstyle==6.3.0
# via waldiez-jupyter (pyproject.toml)
pylint==3.3.2
# via waldiez-jupyter (pyproject.toml)
python-dotenv==1.0.1
# via waldiez-jupyter (pyproject.toml)
ruff==0.8.2
# via waldiez-jupyter (pyproject.toml)
ruff==0.8.3
toml; python_version <= "3.10"
toml==0.10.2
# via waldiez-jupyter (pyproject.toml)
types-pyyaml==6.0.12.20240917
# via waldiez-jupyter (pyproject.toml)
types-PyYAML==6.0.12.20240917
types-toml==0.10.8.20240310
# via waldiez-jupyter (pyproject.toml)
waldiez==0.1.14
# via waldiez-jupyter (pyproject.toml)
yamllint==1.35.1
# via waldiez-jupyter (pyproject.toml)
Loading

0 comments on commit 7a56901

Please sign in to comment.