Skip to content

Commit b033ec7

Browse files
authored
Merge main into 002-mental-prosthetic-refinement
Resolved conflicts in: - features/spec-kit/src/specify_cli/__init__.py: Added validation system - package.json: Combined dependency updates from both branches - .specify/templates/: Took main branch versions with validation system - features/spec-kit/templates/: Took main branch analysis templates Brings validation system and spec-kit improvements to 002 branch.
2 parents cd81d28 + 0f04680 commit b033ec7

41 files changed

Lines changed: 16279 additions & 12268 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.specify/templates/tasks-template-brown.md‎

Lines changed: 173 additions & 40 deletions
Large diffs are not rendered by default.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
fastapi==0.119.0
22
uvicorn==0.37.0
3-
pydantic==2.12.0
3+
pydantic==2.12.3
44
vllm==0.11.0
55
requests==2.32.5
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
fastapi==0.119.0
2-
uvicorn==0.37.0
2+
uvicorn==0.38.0
33
pydantic==2.12.0
44
vllm==0.11.0
55
requests==2.32.5

‎apps/jane-orchestrator/pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description = "Jane Orchestrator Service"
55
requires-python = ">=3.12"
66
dependencies = [
77
"fastapi==0.119.0",
8-
"uvicorn==0.37.0",
8+
"uvicorn==0.38.0",
99
"pydantic==2.12.0",
1010
"sqlalchemy==2.0.0",
1111
"psycopg2-binary==2.9.9",

‎apps/jane-orchestrator/requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
fastapi==0.119.0
2-
uvicorn==0.37.0
2+
uvicorn==0.38.0
33
pydantic==2.12.0
44
sqlalchemy==2.0.44
55
django==5.2.7
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
fastapi==0.119.0
22
uvicorn==0.37.0
3-
pydantic==2.12.0
3+
pydantic==2.12.3
44
vllm==0.11.0
55
requests==2.32.5

‎docs/tasks-37-project-integration.md‎

Lines changed: 805 additions & 0 deletions
Large diffs are not rendered by default.

‎features/Ghostwriter/requirements/base.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ django-filter==24.3
3030
django-import-export==4.1.1
3131
django-q2==1.7.2
3232
djangorestframework-api-key==3.0.0
33-
django-tinymce==3.4.0 # Deprecated, but kept here for legacy migrations
33+
django-tinymce==4.1.0 # Deprecated, but kept here for legacy migrations
3434
docutils==0.18.1
3535
docxtpl==0.18.0
3636
dnspython==2.6.1
3737
jinja2==3.1.5
3838
python-docx==1.1.2
3939
python-nmap==0.7.1
4040
python-pptx==1.0.2
41-
requests==2.32.3
41+
requests==2.32.4
4242
django-timezone-field==7.0.0
4343
pyjwt[crypto]==2.9.0
4444
psutil==6.0.0
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
PyYAML==6.0.1
2-
requests==2.31.0
3-
urllib3==2.1.0
2+
requests==2.32.4
3+
urllib3==2.5.0

‎features/Nemesis/libs/common/poetry.lock‎

Lines changed: 113 additions & 112 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)