Skip to content

Commit

Permalink
Merge pull request #41 from waldiez/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
lazToum authored Dec 8, 2024
2 parents d272598 + e9bb203 commit 1b17848
Show file tree
Hide file tree
Showing 13 changed files with 320 additions and 173 deletions.
3 changes: 2 additions & 1 deletion .flake8
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[flake8]
ignore = E203, E266, E501, W503, F403, F401, E402, W291
max-line-length = 120
max-line-length = 80
max-complexity = 10
application-import-names = hypermodern_python,tests
select = B,C,E,F,W,T4,B9
Expand All @@ -14,4 +14,5 @@ exclude =
build,
dist,
examples,
notebooks,
waldiez_out,
1 change: 0 additions & 1 deletion .github/workflows/container.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ on:
push:
tags:
- "v[0-9]+.[0-9]+.[0-9]+"
pull_request:
branches:
- main

Expand Down
2 changes: 2 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@
"httputil",
"Hugle",
"Hypatia",
"hypermodern",
"imagename",
"Ioannidou",
"ioloop",
Expand Down Expand Up @@ -281,6 +282,7 @@
"Principia",
"Proskuriakova",
"pyautogen",
"pycache",
"pydocstyle",
"pylint",
"pyproject",
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.17

- Updated @waldiez/react to v0.1.18
- Updated waldiez to v0.1.14
- Updated other js dependencies
- Updated other py dependencies

## v0.1.16

- Updated @waldiez/react to v0.1.17
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@waldiez/jupyter",
"version": "0.1.16",
"version": "0.1.17",
"description": "A Waldiez JupyterLab extension.",
"keywords": [
"waldiez",
Expand Down Expand Up @@ -88,19 +88,19 @@
"@jupyterlab/ui-components-extension": "^4.3.2",
"@lumino/algorithm": "^2.0.2",
"@lumino/widgets": "^2.5.0",
"@waldiez/react": "0.1.17"
"@waldiez/react": "0.1.18"
},
"devDependencies": {
"@jest/globals": "^29.7.0",
"@jupyterlab/builder": "^4.3.2",
"@jupyterlab/testutils": "^4.3.2",
"@stylistic/eslint-plugin": "^2.11.0",
"@testing-library/react": "^16.0.1",
"@testing-library/react": "^16.1.0",
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@types/jest": "^29.5.14",
"@types/json-schema": "^7.0.15",
"@types/node": "^22.10.1",
"@types/react": "^18.3.13",
"@types/react": "^18.3.14",
"@types/react-addons-linked-state-mixin": "^0.14.27",
"@typescript-eslint/eslint-plugin": "^8.17.0",
"@typescript-eslint/parser": "^8.17.0",
Expand Down
19 changes: 13 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ classifiers = [
dependencies = [
"jupyter_server>=2.0.1,<3",
"pathvalidate==3.2.1",
"waldiez==0.1.13",
"waldiez==0.1.14",
]
dynamic = ["version", "description", "authors", "urls", "keywords"]
[project.optional-dependencies]
test = [
"coverage==7.6.8",
"coverage==7.6.9",
"pytest==8.3.4",
'pytest-datadir==1.5.0',
"pytest-cov==6.0.0",
Expand Down Expand Up @@ -119,7 +119,7 @@ ignore = ["W002"]

# black
[tool.black]
line-length = 120
line-length = 80
skip-string-normalization = true
include = '''
\.pyi?$
Expand All @@ -139,6 +139,7 @@ exclude = '''
| dist
| node_modules
| examples
| notebooks
)/
'''

Expand All @@ -162,6 +163,7 @@ exclude = [
'build',
'dist',
'examples',
'notebooks',
'node_modules',
'waldiez_out',
]
Expand All @@ -176,13 +178,14 @@ skip = [
'build',
'dist',
'examples',
'notebooks',
'waldiez_out'
]
# known_local_folder = ["..."]
include_trailing_comma = true
force_grid_wrap = 0
use_parentheses = true
line_length = 120
line_length = 80

[tool.pydocstyle]
match-dir = '''
Expand All @@ -192,6 +195,7 @@ match-dir = '''
[^!(dist)]
[^!(node_modules)]
[^!(examples)]
[^!(notebooks)]
[^!(waldiez_out)]
'''

Expand Down Expand Up @@ -271,10 +275,11 @@ skips = ['*_test.py', '*/test_*.py']

# ruff
[tool.ruff]
line-length = 120
line-length = 80
extend-exclude = [
"**/.venv",
"**/examples",
"**/notebooks",
"**/.local",
"**/node_modules",
"**/build",
Expand Down Expand Up @@ -314,7 +319,9 @@ addopts = """

# consider_namespace_packages = true
# pythonpath = []
# filterwarnings = []
filterwarnings = [
"ignore::DeprecationWarning",
]
python_files = ["test_*.py", "*_test.py"]

# coverage
Expand Down
2 changes: 1 addition & 1 deletion requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ types-pyyaml==6.0.12.20240917
# via waldiez-jupyter (pyproject.toml)
types-toml==0.10.8.20240310
# via waldiez-jupyter (pyproject.toml)
waldiez==0.1.13
waldiez==0.1.14
# via waldiez-jupyter (pyproject.toml)
yamllint==1.35.1
# via waldiez-jupyter (pyproject.toml)
26 changes: 13 additions & 13 deletions requirements/main.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# This file was autogenerated by uv via the following command:
# uv pip compile pyproject.toml --output-file requirements/main.txt
ag2==0.4.1
# via waldiez
annotated-types==0.7.0
# via pydantic
anyio==4.4.0
Expand Down Expand Up @@ -37,17 +35,17 @@ click==8.1.7
defusedxml==0.7.1
# via nbconvert
diskcache==5.6.3
# via ag2
# via pyautogen
distro==1.9.0
# via openai
docker==7.1.0
# via ag2
# via pyautogen
exceptiongroup==1.2.2
# via anyio
fastjsonschema==2.20.0
# via nbformat
flaml==2.2.0
# via ag2
# via pyautogen
fqdn==1.5.1
# via jsonschema
h11==0.14.0
Expand Down Expand Up @@ -126,18 +124,18 @@ nbformat==5.10.4
# nbconvert
numpy==1.26.4
# via
# ag2
# flaml
# pyautogen
openai==1.44.0
# via ag2
# via pyautogen
overrides==7.7.0
# via jupyter-server
packaging==24.1
# via
# ag2
# jupyter-server
# jupytext
# nbconvert
# pyautogen
pandocfilters==1.5.1
# via nbconvert
pathvalidate==3.2.1
Expand All @@ -148,12 +146,14 @@ prometheus-client==0.20.0
# via jupyter-server
ptyprocess==0.7.0
# via terminado
pyautogen==0.5.0
# via waldiez
pycparser==2.22
# via cffi
pydantic==2.9.0
# via
# ag2
# openai
# pyautogen
pydantic-core==2.23.2
# via pydantic
pygments==2.18.0
Expand All @@ -165,7 +165,7 @@ python-dateutil==2.9.0.post0
# arrow
# jupyter-client
python-dotenv==1.0.1
# via ag2
# via pyautogen
python-json-logger==2.0.7
# via jupyter-events
pyyaml==6.0.2
Expand Down Expand Up @@ -218,13 +218,13 @@ sniffio==1.3.1
soupsieve==2.6
# via beautifulsoup4
termcolor==2.4.0
# via ag2
# via pyautogen
terminado==0.18.1
# via
# jupyter-server
# jupyter-server-terminals
tiktoken==0.7.0
# via ag2
# via pyautogen
tinycss2==1.3.0
# via nbconvert
tomli==2.0.1
Expand Down Expand Up @@ -265,7 +265,7 @@ urllib3==2.2.2
# via
# docker
# requests
waldiez==0.1.13
waldiez==0.1.14
# via waldiez-jupyter (pyproject.toml)
webcolors==24.8.0
# via jsonschema
Expand Down
4 changes: 2 additions & 2 deletions requirements/test.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file was autogenerated by uv via the following command:
# uv pip compile pyproject.toml --output-file requirements/test.txt --extra=test --no-deps
coverage==7.6.8
coverage==7.6.9
# via waldiez-jupyter (pyproject.toml)
jupyter-server==2.14.2
# via waldiez-jupyter (pyproject.toml)
Expand All @@ -22,5 +22,5 @@ pytest-timeout==2.3.1
# via waldiez-jupyter (pyproject.toml)
pytest-xdist==3.6.1
# via waldiez-jupyter (pyproject.toml)
waldiez==0.1.13
waldiez==0.1.14
# via waldiez-jupyter (pyproject.toml)
8 changes: 6 additions & 2 deletions scripts/dev/requirements.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,13 @@ def _write_all_dot_txt() -> None:
def _ensure_uv() -> None:
"""Ensure that the `uv` tool is installed."""
if not shutil.which("uv"):
subprocess.run(["python", "-m", "pip", "install", "uv"], check=True) # nosemgrep # nosec
subprocess.run( # nosemgrep # nosec
["python", "-m", "pip", "install", "uv"], check=True
)
try:
subprocess.run(["uv", "--version"], check=True, stdout=subprocess.DEVNULL) # nosemgrep # nosec
subprocess.run( # nosemgrep # nosec
["uv", "--version"], check=True, stdout=subprocess.DEVNULL
)
except subprocess.CalledProcessError:
print("Failed to run `uv`.")
print("Please make sure that the `uv` tool is installed.")
Expand Down
4 changes: 3 additions & 1 deletion scripts/dev/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ def _start_jupyter() -> None:
def _start_jlpm() -> None:
try:
# pylint: disable=subprocess-run-check, line-too-long
subprocess.run([JLPM_COMMAND, "run", "watch"], cwd=ROOT_DIR, check=True) # nosemgrep # nosec
subprocess.run( # nosemgrep # nosec
[JLPM_COMMAND, "run", "watch"], cwd=ROOT_DIR, check=True
)
except KeyboardInterrupt:
_stop()

Expand Down
Loading

0 comments on commit 1b17848

Please sign in to comment.