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

Pre-v2.10.0 #226

Merged
merged 1 commit into from
Oct 11, 2024
Merged

Pre-v2.10.0 #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions .github/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
blinker==1.8.2
cffi==1.16.0
cffi==1.17.1
click==8.1.7
colorlog==6.8.2
coverage==7.6.0
coverage==7.6.2
cryptography==43.0.1
Flask==3.0.3
gcovr==7.2
gcovr==8.0
imutils==0.5.4
itsdangerous==2.2.0
Jinja2==3.1.4
lxml==5.2.2
MarkupSafe==2.1.5
lxml==5.3.0
MarkupSafe==3.0.1
numpy==1.26.4
opencv-python-headless==4.9.0.80
protobuf==4.24.2
pycparser==2.22
Pygments==2.18.0
pyzmq==26.0.3
scipy==1.14.0
scipy==1.14.1
sk-video==1.1.10
Werkzeug==3.0.3
Werkzeug==3.0.4
6 changes: 3 additions & 3 deletions .github/scripts/Dockerfile.checkin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ RUN apt-get update -y && apt-get upgrade -y && \
apt-get clean && rm -rf /var/lib/apt/lists/*

WORKDIR /usr/src
# hadolint ignore=DL3003,SC2086
RUN apt update -y && \
apt install -y libffi-dev libgdbm-dev libnss3-dev libreadline-dev libsqlite3-dev zlib1g-dev && \
# hadolint ignore=DL3003,DL3008,SC2086
RUN apt-get update -y && \
apt-get install -y --no-install-recommends libffi-dev libgdbm-dev libnss3-dev libreadline-dev libsqlite3-dev zlib1g-dev && \
curl -O https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz && \
tar -xzf Python-${PYTHON_VERSION}.tgz && cd Python-${PYTHON_VERSION} && \
./configure --enable-optimizations && make ${BUILD_THREADS} && make altinstall && \
Expand Down
8 changes: 4 additions & 4 deletions docker/base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ RUN apt-get update -y && apt-get upgrade -y && \
apt-get clean && rm -rf /var/lib/apt/lists/*

WORKDIR /usr/src
# hadolint ignore=DL3003,SC2086
RUN apt update -y && \
apt install -y libffi-dev libgdbm-dev libnss3-dev libreadline-dev libsqlite3-dev zlib1g-dev && \
# hadolint ignore=DL3003,DL3008,SC2086
RUN apt-get update -y && \
apt-get install -y --no-install-recommends libffi-dev libgdbm-dev libnss3-dev libreadline-dev libsqlite3-dev zlib1g-dev && \
curl -O https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz && \
tar -xzf Python-${PYTHON_VERSION}.tgz && cd Python-${PYTHON_VERSION} && \
./configure --enable-optimizations && make ${BUILD_THREADS} && make altinstall && \
Expand Down Expand Up @@ -166,7 +166,7 @@ RUN curl -L -O https://github.com/gpakosz/peg/releases/download/${PEG_VERSION}/p
# CLEANUP
RUN rm -rf /dependencies /usr/local/share/doc /usr/local/share/man && \
mkdir -p /opt/dist/usr/include/x86_64-linux-gnu && \
cp -rp /usr/include/x86_64-linux-gnu /opt/dist/usr/include/x86_64-linux-gnu
cp -rp /usr/include/x86_64-linux-gnu /opt/dist/usr/include/x86_64-linux-gnu


############################################################
Expand Down