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.

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

switch 3.10 #232

Merged
merged 2 commits into from
Dec 31, 2024
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
3 changes: 2 additions & 1 deletion .github/workflows/builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
python: [3.8]
python: [3.10]

steps:
- uses: actions/checkout@v4
- name: Set up Python
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doc-status.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: 3.10
architecture: x64
- name: check status
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python: [3.8]
python: ['3.10']
steps:
- uses: actions/checkout@v4
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gh-page.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ jobs:
see-page-build-payload:
runs-on: ubuntu-latest
steps:
- name: Set up Python 3.8
- name: Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: 3.10
architecture: x64
- name: check status
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: 3.10
architecture: x64
- name: Cache python modules
uses: actions/cache@v4
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: 3.10
architecture: x64
- name: Install package
run: |
Expand All @@ -64,7 +64,7 @@ jobs:
uses: conda-incubator/setup-miniconda@v4
with:
auto-update-conda: true
python-version: 3.8
python-version: 3.10
- name: Install dependencies
run: |
conda install -y conda-build conda-verify anaconda-client
Expand All @@ -90,7 +90,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python: [3.8]
python: ['3.10']
steps:
- uses: actions/checkout@v4
- name: Miniconda setup
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python: [3.8]
python: ['3.10']
steps:
- uses: actions/checkout@v4
- name: Set up Python
Expand All @@ -31,7 +31,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python: [3.8]
python: ['3.10']
steps:
- uses: actions/checkout@v4
- name: Set up Python
Expand All @@ -51,7 +51,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python: [3.8]
python: ['3.10']
steps:
- uses: actions/checkout@v4
- name: Set up Python
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python: [3.8]
python: ['3.10']
steps:
- uses: actions/checkout@v4
- name: Set up Python
Expand All @@ -98,7 +98,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python: [3.8]
python: ['3.10']
steps:
- uses: actions/checkout@v4
- name: Set up Python
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python: [3.8]
python: ['3.10']
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python: [3.8]
python: ['3.10']
steps:
- uses: actions/checkout@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.8.16-slim
FROM python:3.10.16-slim

# set environment variables
ENV PATH="/usr/local/bin:$PATH"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ prediction = engine.predict(im)

## Setup

Python 3.8 (or higher) and [pip](https://pip.pypa.io/en/stable/)/[conda](https://docs.conda.io/en/latest/miniconda.html) are required to install PyroEngine.
Python 3.10 (or higher) and [pip](https://pip.pypa.io/en/stable/)/[conda](https://docs.conda.io/en/latest/miniconda.html) are required to install PyroEngine.

### Developer installation

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ classifiers = [
"Natural Language :: English",
"Operating System :: OS Independent",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
Expand Down
1,991 changes: 939 additions & 1,052 deletions src/poetry.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ authors = ["Pyronear <[email protected]>"]
license = "Apache-2.0"

[tool.poetry.dependencies]
python = "^3.8"
python = "^3.10"
pyroclient = { git = "https://github.com/pyronear/pyro-api.git", rev = "767be30a781b52b29d68579d543e3f45ac8c4713", subdirectory = "client" }
pyroengine = "^0.2.0"
python-dotenv = ">=0.15.0"
Expand Down
118 changes: 63 additions & 55 deletions src/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,55 +1,63 @@
certifi==2024.6.2 ; python_version >= "3.8" and python_version < "4"
charset-normalizer==3.3.2 ; python_version >= "3.8" and python_version < "4"
colorama==0.4.6 ; python_version >= "3.8" and python_version < "4.0" and platform_system == "Windows"
coloredlogs==15.0.1 ; python_version >= "3.8" and python_version < "4"
contourpy==1.1.1 ; python_version >= "3.8" and python_version < "4.0"
cycler==0.12.1 ; python_version >= "3.8" and python_version < "4.0"
filelock==3.15.4 ; python_version >= "3.8" and python_version < "4"
flatbuffers==24.3.25 ; python_version >= "3.8" and python_version < "4"
fonttools==4.53.1 ; python_version >= "3.8" and python_version < "4.0"
fsspec==2024.6.0 ; python_version >= "3.8" and python_version < "4"
huggingface-hub==0.23.4 ; python_version >= "3.8" and python_version < "4"
humanfriendly==10.0 ; python_version >= "3.8" and python_version < "4"
idna==3.7 ; python_version >= "3.8" and python_version < "4"
importlib-resources==6.4.0 ; python_version >= "3.8" and python_version < "3.10"
intel-openmp==2021.4.0 ; python_version >= "3.8" and python_version < "4.0" and platform_system == "Windows"
jinja2==3.1.4 ; python_version >= "3.8" and python_version < "4.0"
kiwisolver==1.4.5 ; python_version >= "3.8" and python_version < "4.0"
markupsafe==2.1.5 ; python_version >= "3.8" and python_version < "4.0"
matplotlib==3.7.5 ; python_version >= "3.8" and python_version < "4.0"
mkl==2021.4.0 ; python_version >= "3.8" and python_version < "4.0" and platform_system == "Windows"
mpmath==1.3.0 ; python_version >= "3.8" and python_version < "4"
networkx==3.1 ; python_version >= "3.8" and python_version < "4.0"
numpy==1.24.4 ; python_version >= "3.8" and python_version < "4"
ncnn==1.0.20240410 ; python_version >= "3.8" and python_version < "4"
opencv-python==4.10.0.84 ; python_version >= "3.8" and python_version < "4.0"
packaging==24.1 ; python_version >= "3.8" and python_version < "4"
pandas==2.0.3 ; python_version >= "3.8" and python_version < "4.0"
pillow==10.3.0 ; python_version >= "3.8" and python_version < "4"
protobuf==5.27.1 ; python_version >= "3.8" and python_version < "4"
psutil==6.0.0 ; python_version >= "3.8" and python_version < "4.0"
py-cpuinfo==9.0.0 ; python_version >= "3.8" and python_version < "4.0"
pyparsing==3.1.2 ; python_version >= "3.8" and python_version < "4.0"
pyreadline3==3.4.1 ; sys_platform == "win32" and python_version >= "3.8" and python_version < "4"
pyroclient @ git+https://github.com/pyronear/pyro-api.git@767be30a781b52b29d68579d543e3f45ac8c4713#subdirectory=client ; python_version >= "3.8" and python_version < "4"
pyroengine==0.2.0 ; python_version >= "3.8" and python_version < "4"
python-dateutil==2.9.0.post0 ; python_version >= "3.8" and python_version < "4.0"
python-dotenv==1.0.1 ; python_version >= "3.8" and python_version < "4.0"
pytz==2024.1 ; python_version >= "3.8" and python_version < "4.0"
pyyaml==6.0.1 ; python_version >= "3.8" and python_version < "4.0"
requests==2.32.3 ; python_version >= "3.8" and python_version < "4"
scipy==1.9.3 ; python_version >= "3.8" and python_version < "4.0"
seaborn==0.13.2 ; python_version >= "3.8" and python_version < "4.0"
six==1.16.0 ; python_version >= "3.8" and python_version < "4.0"
sympy==1.12.1 ; python_version >= "3.8" and python_version < "4"
tbb==2021.13.0 ; python_version >= "3.8" and python_version < "4.0" and platform_system == "Windows"
torch==2.3.1 ; python_version >= "3.8" and python_version < "4.0"
torchvision==0.18.1 ; python_version >= "3.8" and python_version < "4.0"
tqdm==4.66.4 ; python_version >= "3.8" and python_version < "4.0"
triton==2.3.1 ; platform_system == "Linux" and platform_machine == "x86_64" and python_version < "3.12" and python_version >= "3.8"
typing-extensions==4.12.2 ; python_version >= "3.8" and python_version < "4"
tzdata==2024.1 ; python_version >= "3.8" and python_version < "4.0"
ultralytics-thop==2.0.0 ; python_version >= "3.8" and python_version < "4.0"
ultralytics==8.2.50 ; python_version >= "3.8" and python_version < "4.0"
urllib3==2.2.2 ; python_version >= "3.8" and python_version < "4"
zipp==3.19.2 ; python_version >= "3.8" and python_version < "3.10"
certifi==2024.12.14 ; python_version >= "3.10" and python_version < "4"
charset-normalizer==3.4.1 ; python_version >= "3.10" and python_version < "4"
colorama==0.4.6 ; python_version >= "3.10" and python_version < "4.0" and platform_system == "Windows"
coloredlogs==15.0.1 ; python_version >= "3.10" and python_version < "4"
contourpy==1.3.1 ; python_version >= "3.10" and python_version < "4.0"
cycler==0.12.1 ; python_version >= "3.10" and python_version < "4.0"
filelock==3.16.1 ; python_version >= "3.10" and python_version < "4"
flatbuffers==24.12.23 ; python_version >= "3.10" and python_version < "4"
fonttools==4.55.3 ; python_version >= "3.10" and python_version < "4.0"
fsspec==2024.12.0 ; python_version >= "3.10" and python_version < "4"
huggingface-hub==0.27.0 ; python_version >= "3.10" and python_version < "4"
humanfriendly==10.0 ; python_version >= "3.10" and python_version < "4"
idna==3.10 ; python_version >= "3.10" and python_version < "4"
jinja2==3.1.5 ; python_version >= "3.10" and python_version < "4.0"
kiwisolver==1.4.8 ; python_version >= "3.10" and python_version < "4.0"
markupsafe==3.0.2 ; python_version >= "3.10" and python_version < "4.0"
matplotlib==3.10.0 ; python_version >= "3.10" and python_version < "4.0"
mpmath==1.3.0 ; python_version >= "3.10" and python_version < "4"
networkx==3.4.2 ; python_version >= "3.10" and python_version < "4.0"
numpy==1.26.4 ; python_version >= "3.10" and python_version < "4"
nvidia-cublas-cu12==12.4.5.8 ; platform_system == "Linux" and platform_machine == "x86_64" and python_version >= "3.10" and python_version < "4.0"
nvidia-cuda-cupti-cu12==12.4.127 ; platform_system == "Linux" and platform_machine == "x86_64" and python_version >= "3.10" and python_version < "4.0"
nvidia-cuda-nvrtc-cu12==12.4.127 ; platform_system == "Linux" and platform_machine == "x86_64" and python_version >= "3.10" and python_version < "4.0"
nvidia-cuda-runtime-cu12==12.4.127 ; platform_system == "Linux" and platform_machine == "x86_64" and python_version >= "3.10" and python_version < "4.0"
nvidia-cudnn-cu12==9.1.0.70 ; platform_system == "Linux" and platform_machine == "x86_64" and python_version >= "3.10" and python_version < "4.0"
nvidia-cufft-cu12==11.2.1.3 ; platform_system == "Linux" and platform_machine == "x86_64" and python_version >= "3.10" and python_version < "4.0"
nvidia-curand-cu12==10.3.5.147 ; platform_system == "Linux" and platform_machine == "x86_64" and python_version >= "3.10" and python_version < "4.0"
nvidia-cusolver-cu12==11.6.1.9 ; platform_system == "Linux" and platform_machine == "x86_64" and python_version >= "3.10" and python_version < "4.0"
nvidia-cusparse-cu12==12.3.1.170 ; platform_system == "Linux" and platform_machine == "x86_64" and python_version >= "3.10" and python_version < "4.0"
nvidia-nccl-cu12==2.21.5 ; platform_system == "Linux" and platform_machine == "x86_64" and python_version >= "3.10" and python_version < "4.0"
nvidia-nvjitlink-cu12==12.4.127 ; platform_system == "Linux" and platform_machine == "x86_64" and python_version >= "3.10" and python_version < "4.0"
nvidia-nvtx-cu12==12.4.127 ; platform_system == "Linux" and platform_machine == "x86_64" and python_version >= "3.10" and python_version < "4.0"
onnxruntime==1.20.1 ; python_version >= "3.10" and python_version < "4"
opencv-python==4.10.0.84 ; python_version >= "3.10" and python_version < "4.0"
packaging==24.2 ; python_version >= "3.10" and python_version < "4"
pandas==2.2.3 ; python_version >= "3.10" and python_version < "4.0"
pillow==11.0.0 ; python_version >= "3.10" and python_version < "4"
protobuf==5.29.2 ; python_version >= "3.10" and python_version < "4"
psutil==6.1.1 ; python_version >= "3.10" and python_version < "4.0"
py-cpuinfo==9.0.0 ; python_version >= "3.10" and python_version < "4.0"
pyparsing==3.2.0 ; python_version >= "3.10" and python_version < "4.0"
pyreadline3==3.5.4 ; sys_platform == "win32" and python_version >= "3.10" and python_version < "4"
pyroclient @ git+https://github.com/pyronear/pyro-api.git@767be30a781b52b29d68579d543e3f45ac8c4713#subdirectory=client ; python_version >= "3.10" and python_version < "4"
pyroengine==0.2.0 ; python_version >= "3.10" and python_version < "4"
python-dateutil==2.9.0.post0 ; python_version >= "3.10" and python_version < "4.0"
python-dotenv==1.0.1 ; python_version >= "3.10" and python_version < "4.0"
pytz==2024.2 ; python_version >= "3.10" and python_version < "4.0"
pyyaml==6.0.2 ; python_version >= "3.10" and python_version < "4.0"
requests==2.32.3 ; python_version >= "3.10" and python_version < "4"
scipy==1.14.1 ; python_version >= "3.10" and python_version < "4.0"
seaborn==0.13.2 ; python_version >= "3.10" and python_version < "4.0"
setuptools==75.6.0 ; python_version >= "3.12" and python_version < "4.0"
six==1.17.0 ; python_version >= "3.10" and python_version < "4.0"
sympy==1.13.1 ; python_version >= "3.10" and python_version < "4"
torch==2.5.1 ; python_version >= "3.10" and python_version < "4.0"
torchvision==0.20.1 ; python_version >= "3.10" and python_version < "4.0"
tqdm==4.67.1 ; python_version >= "3.10" and python_version < "4.0"
triton==3.1.0 ; platform_system == "Linux" and platform_machine == "x86_64" and python_version < "3.13" and python_version >= "3.10"
typing-extensions==4.12.2 ; python_version >= "3.10" and python_version < "4"
tzdata==2024.2 ; python_version >= "3.10" and python_version < "4.0"
ultralytics-thop==2.0.13 ; python_version >= "3.10" and python_version < "4.0"
ultralytics==8.2.50 ; python_version >= "3.10" and python_version < "4.0"
urllib3==2.3.0 ; python_version >= "3.10" and python_version < "4"
Loading