Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.12"
architecture: "x64"
- name: Display Python version
run: python -c "import sys; print(sys.version)"
Expand Down
2 changes: 1 addition & 1 deletion .python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.10
3.12
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ version: 2
build:
os: ubuntu-24.04
tools:
python: "3.10"
python: "3.12"
apt_packages:
# Native libs needed to build lxml, gevent, cryptography, etc.
- libxml2-dev
Expand Down
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Stage 1: Build stage
FROM python:3.10 AS conpot-builder
FROM python:3.12 AS conpot-builder

# Install required dependencies
RUN apt-get update && apt-get install -y \
Expand All @@ -19,7 +19,7 @@ RUN pip3 install --no-cache-dir uv \
&& uv pip install --system --no-cache .

# Stage 2: Runtime stage
FROM python:3.10-slim
FROM python:3.12-slim

# Install runtime dependencies
RUN apt-get update && apt-get install -y \
Expand All @@ -32,14 +32,14 @@ RUN adduser --disabled-password --gecos "" conpot

# Create required directories and set permissions
RUN mkdir -p /var/log/conpot \
&& mkdir -p /usr/local/lib/python3.10/site-packages/conpot/tests/data/data_temp_fs/ftp \
&& mkdir -p /usr/local/lib/python3.10/site-packages/conpot/tests/data/data_temp_fs/tftp \
&& mkdir -p /usr/local/lib/python3.12/site-packages/conpot/tests/data/data_temp_fs/ftp \
&& mkdir -p /usr/local/lib/python3.12/site-packages/conpot/tests/data/data_temp_fs/tftp \
&& chown -R conpot:conpot /var/log/conpot \
&& chown -R conpot:conpot /usr/local/lib/python3.10/site-packages/conpot/tests/data
&& chown -R conpot:conpot /usr/local/lib/python3.12/site-packages/conpot/tests/data

# Set working directory and copy dependencies from build stage
WORKDIR /home/conpot
COPY --from=conpot-builder /usr/local/lib/python3.10/ /usr/local/lib/python3.10/
COPY --from=conpot-builder /usr/local/lib/python3.12/ /usr/local/lib/python3.12/
COPY --from=conpot-builder /usr/local/bin/ /usr/local/bin/

# Set permissions for non-root user
Expand Down
2 changes: 1 addition & 1 deletion docs/source/installation/install.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Installation on a host
========================

This guide covers running Conpot directly on your machine (outside Docker). Conpot requires **Python 3.10 or newer** (see ``requires-python`` in ``pyproject.toml``).
This guide covers running Conpot directly on your machine (outside Docker). Conpot requires **Python 3.12 or newer** (see ``requires-python`` in ``pyproject.toml``).

System packages (Debian / Ubuntu)
---------------------------------
Expand Down
7 changes: 4 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ classifiers = [
"Intended Audience :: Developers",
"Operating System :: POSIX :: Linux",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python",
"Topic :: Security",
]
requires-python = ">=3.10"
requires-python = ">=3.12"
dynamic = ["version"]
dependencies = [
"setuptools>=61,<82",
Expand All @@ -34,13 +34,14 @@ dependencies = [
"libtaxii>=1.1.0",
"crc16",
"natsort",
"scapy==2.4.5",
"scapy>=2.6.0,<3",
"hpfeeds3",
"modbus-tk",
"stix-validator",
"stix",
"cybox",
"bacpypes==0.17.0",
"pyasyncore>=1.0.2",
"pyghmi==1.4.1",
"mixbox",
"cpppo",
Expand Down
448 changes: 40 additions & 408 deletions uv.lock

Large diffs are not rendered by default.

Loading