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.

Sign up for GitHub

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

Bump python version #289

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Bump python version #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58bf214
Bump python version
bruce-y Sep 6, 2024
669f7b1
Fix incompatibilities
bruce-y Sep 6, 2024
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
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# They need to be redefined in each stage to be used in that stage
ARG DEBIAN_BOOKWORM_VERSION=20240722
ARG GO_VERSION=1.23.0
ARG PYTHON_VERSION=3.10.14
ARG PYTHON_VERSION=3.12.5
ARG NODE_VERSION_MAJOR=20
ARG NODE_VERSION=20.16.0
ARG PNPM_VERSION=9.7.1
Expand Down Expand Up @@ -151,7 +151,7 @@ COPY --chmod=755 /workers/python
COPY s6-rc.d/ /etc/s6-overlay/s6-rc.d/

# NOTE(frank): I don't like this first line. However, the code in the dist/ folder of the plugins
# isn't looking in the dist folder of the types. I think this is because we don't
# isn't looking in the dist folder of the types. I think this is because we don't
# bubble up index.ts files.
RUN cd /app/worker.py && \
pip install --no-cache-dir --upgrade pip setuptools && \
Expand Down
2 changes: 1 addition & 1 deletion workers/python/.pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ repos:
- "types-urllib3==1.26.25"
- "typing-inspect==0.8.0"
- "typing_extensions==4.2.0"
- "pydantic==1.10.8"
- "pydantic==2.9.0"
- "ujson==5.6.0"
- "redis==4.3.5"
- "types-ujson==5.6.0.0"
Expand Down
2 changes: 1 addition & 1 deletion workers/python/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies = [
"pydash==6.0.2",
"redis==4.6.0",
"ujson==5.10.0",
"pydantic==1.10.14",
"pydantic==2.9.0",
"psutil==5.9.8",
"simplejson==3.19.2",
"plotly==5.19.0",
Expand Down
5 changes: 3 additions & 2 deletions workers/python/requirements-slim.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ plotly==5.19.0
prometheus-client==0.14.1
protobuf==4.25.3
psutil==5.9.8
pydantic==1.10.14
pydantic==2.9.0
pydash==6.0.2
python-dotenv==0.21.1
python-dotenv==1.0.0
redis==4.6.0
requests==2.32.0
requests-futures==1.0.1
Expand All @@ -41,3 +41,4 @@ ujson==5.10.0
urllib3==2.2.2
wrapt==1.16.0
yarl==1.9.4
pycti-arbin==0.0.13
8 changes: 4 additions & 4 deletions workers/python/src/transport/redis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@

class RequestData(BaseModel):
props: dict
baggage: Optional[dict]
quotas: Optional[Quotas]
baggage: Optional[dict | None] = None
quotas: Optional[Quotas | None] = None


class RedisMessage(BaseModel):
Expand All @@ -53,12 +53,12 @@ class RequestMetadata(BaseModel):
# Plugin Event
event: str
bucket: str
carrier: Optional[dict]
carrier: Optional[dict | None] = None


class RequestDataWrapper(BaseModel):
data: RequestData
pinned: Optional[RequestMetadata]
pinned: Optional[RequestMetadata | None]


class ExecuteRequest(BaseModel):
Expand Down
Loading