Skip to content

Commit 3dfa36a

Browse files
committed
Fix dependencies
Signed-off-by: Beat Buesser <[email protected]>
1 parent 60b46c1 commit 3dfa36a

File tree

6 files changed

+10
-27
lines changed

6 files changed

+10
-27
lines changed

.github/actions/deepspeech-v3/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ RUN apt-get update \
1111
libx11-xcb1 \
1212
git \
1313
gcc \
14-
mono-mcs \
1514
libavcodec-extra \
1615
ffmpeg \
1716
curl \

.github/actions/espresso/Dockerfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
# Get base image
22
FROM python:3.10.17-slim-bookworm
33

4-
# Set to install things in non-interactive mode
5-
ENV DEBIAN_FRONTEND noninteractive
6-
74
# Install system wide software
85
RUN apt-get update \
96
&& apt-get install -y \
@@ -16,7 +13,6 @@ RUN apt-get update \
1613
libx11-xcb1 \
1714
git \
1815
gcc \
19-
mono-mcs \
2016
libavcodec-extra \
2117
ffmpeg \
2218
curl \

.github/actions/goturn/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ RUN apt-get update \
1111
libx11-xcb1 \
1212
git \
1313
gcc \
14-
mono-mcs \
1514
libavcodec-extra \
1615
ffmpeg \
1716
curl \
@@ -28,7 +27,7 @@ RUN apt-get update \
2827
# Install necessary libraries for goturn
2928
RUN pip install --ignore-installed torch==1.11.0 torchaudio==0.11.0 torchvision==0.12.0 --index-url https://download.pytorch.org/whl/cpu
3029
RUN pip install --ignore-installed --no-deps pytorch_lightning==0.7.1 torch_lr_finder==0.2.1 torchsummary==1.5.1
31-
RUN pip install tensorflow==2.9 scikit-learn==1.6.1 pytest~=6.2.5 pytest-cov~=4.1.0
30+
RUN pip install tensorflow==2.9 scikit-learn==1.6.1 pytest~=6.2.5 pytest-cov~=4.1.0 matplotlib==3.9.4
3231

3332
RUN git clone https://github.com/nrupatunga/goturn-pytorch.git /tmp/goturn-pytorch
3433
#RUN cd /tmp/goturn-pytorch && pip install -r requirements.txt
Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
# Get base from a tensorflow image
2-
FROM tensorflow/tensorflow:2.13.0
3-
4-
# Set to install things in non-interactive mode
5-
ENV DEBIAN_FRONTEND noninteractive
1+
# Get base image
2+
FROM python:3.10.17-slim-bookworm
63

74
# Install system wide softwares
85
RUN apt-get update \
@@ -11,25 +8,21 @@ RUN apt-get update \
118
libx11-xcb1 \
129
git \
1310
gcc \
14-
mono-mcs \
1511
libavcodec-extra \
1612
ffmpeg \
1713
curl \
1814
libsndfile-dev \
1915
libsndfile1 \
2016
wget \
2117
unzip \
18+
software-properties-common \
19+
gnupg2 \
20+
lsb-release \
2221
&& apt-get clean all \
2322
&& rm -r /var/lib/apt/lists/*
2423

25-
RUN wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh
26-
RUN bash Miniconda3-latest-Linux-x86_64.sh -b -p /miniconda
27-
RUN /miniconda/bin/conda install --yes \
28-
astropy \
29-
matplotlib \
30-
pandas \
31-
scikit-learn \
32-
scikit-image
24+
RUN pip install --upgrade pip setuptools wheel
25+
RUN pip install tensorflow==2.19.0
3326

3427
# Install necessary libraries for tensorflow faster rcnn
3528
RUN mkdir TensorFlow
@@ -40,7 +33,4 @@ RUN cd TensorFlow/models/research && /TensorFlow/protobuf/bin/protoc object_dete
4033
RUN cd TensorFlow/models/research && cp object_detection/packages/tf2/setup.py .
4134
RUN cd TensorFlow/models/research && python -m pip install .
4235

43-
RUN pip install tqdm
44-
RUN pip install requests
45-
RUN pip install numba==0.50.0
46-
RUN pip install pytest-cov
36+
RUN pip install tqdm requests llvmlite numba==0.56.4 pytest-cov

.github/actions/yolo/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ RUN apt-get update \
88
libx11-xcb1 \
99
git \
1010
gcc \
11-
mono-mcs \
1211
cmake \
1312
libavcodec-extra \
1413
ffmpeg \

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ def get_version(rel_path):
119119
"Intended Audience :: Education",
120120
"Intended Audience :: Science/Research",
121121
"License :: OSI Approved :: MIT License",
122-
"Programming Language :: Python :: 3.9",
123122
"Programming Language :: Python :: 3.10",
124123
"Programming Language :: Python :: 3.11",
124+
"Programming Language :: Python :: 3.12",
125125
"Topic :: Software Development :: Libraries",
126126
"Topic :: Software Development :: Libraries :: Python Modules",
127127
"Topic :: Scientific/Engineering :: Artificial Intelligence",

0 commit comments

Comments
 (0)