Skip to content

Commit d072a11

Browse files
KMichaKMicha
committed
use uv for 2024
1 parent 44509fd commit d072a11

2 files changed

Lines changed: 28 additions & 31 deletions

File tree

‎Dockerfile24‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -28,66 +28,66 @@ RUN apt-get update && apt-get -y --no-install-recommends install libspatialindex
2828
# install Python
2929
RUN apt-get update && apt-get -y --no-install-recommends install python3-dev python3-plotly && apt-get clean
3030
RUN apt-get -y --no-install-recommends install python3-scipy python3-h5py
31-
##RUN pip3 install --upgrade pip
32-
RUN pip3 install setuptools wheel psutil pipreqs arrow
33-
RUN pip3 install aiohttp asyncio
31+
32+
RUN uv pip install setuptools wheel psutil pipreqs arrow
33+
RUN uv pip install aiohttp asyncio
3434
## No module named 'gendoc' -> 22.04 only
35-
## RUN pip3 install --upgrade pip
36-
## RUN pip3 install gendoc
37-
## RUN pip3 install datatable
35+
## RUN uv pip install --upgrade pip
36+
## RUN uv pip install gendoc
37+
## RUN uv pip install datatable
3838

3939
# plotly==5.9 ??
4040
# https://github.com/cgoldberg/xvfbwrapper
41-
RUN pip3 install seaborn plotly kaleido xvfbwrapper
41+
RUN uv pip install seaborn plotly kaleido xvfbwrapper
4242

4343
# https://shapely.readthedocs.io/en/2.1.1/manual.html
4444
# https://cartopy.readthedocs.io/stable/
45-
## RUN pip3 install shapely cartopy --no-binary shapely --no-binary cartopy
45+
## RUN uv pip install shapely cartopy --no-binary shapely --no-binary cartopy
4646

4747
# PIL: https://pypi.org/project/pillow/
4848
# folium: https://python-visualization.github.io/folium/latest/
49-
RUN pip3 install pillow folium
49+
RUN uv pip install pillow folium
5050

5151
# rtree==0.9.4 & geopandas==0.6 & xlrd==1.2 & openpyxl==3.0 ??
52-
RUN pip3 install scipy rtree geopandas fiona patsy statsmodels xlrd openpyxl geocoder
52+
RUN uv pip install scipy rtree geopandas fiona patsy statsmodels xlrd openpyxl geocoder
5353
# beautifulsoup4==4.9 ??
54-
RUN pip3 install connexion beautifulsoup4
55-
#RUN pip3 install pycurl #recommended by jupyterlab
54+
RUN uv pip install connexion beautifulsoup4
55+
#RUN uv pip install pycurl #recommended by jupyterlab
5656
# https://pingouin-stats.org/build/html/index.html
57-
##RUN pip3 install pingouin
58-
RUN pip3 install selenium webdriver-manager selenium-requests
57+
##RUN uv pip install pingouin
58+
RUN uv pip install selenium webdriver-manager selenium-requests
5959

6060
#may change later to own package:
6161
#deep-translator: https://pypi.org/project/deep-translator/
62-
RUN pip3 install deep-translator
62+
RUN uv pip install deep-translator
6363
#
64-
RUN pip3 install newspaper4k
65-
#RUN pip3 install pythainlp #for thai
66-
#RUN pip3 install newspaper4k[th] #for thai
67-
#RUN pip3 install newspaper4k[all] #for all tokenizers
64+
RUN uv pip install newspaper4k
65+
#RUN uv pip install pythainlp #for thai
66+
#RUN uv pip install newspaper4k[th] #for thai
67+
#RUN uv pip install newspaper4k[all] #for all tokenizers
6868

6969
## Install new chrome ??
7070
## wget -q https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb; dpkg -i google-chrome-stable_current_amd64.deb
7171

7272
# OpenCV
7373
RUN apt-get -y --no-install-recommends install python3-opencv
74-
RUN pip3 install opencv-python==4.5.5.64
74+
RUN uv pip install opencv-python==4.5.5.64
7575

7676
#FastAPI: https://fastapi.tiangolo.com
77-
RUN pip3 install "fastapi[standard]"
77+
RUN uv pip install "fastapi[standard]"
7878

7979
# Freeze python requirements here:
8080
RUN mkdir -p /cre && \
81-
pip3 freeze --no-cache-dir > /cre/requirements.txt.orig
81+
uv pip freeze --no-cache-dir > /cre/requirements.txt.orig
8282

8383
RUN mkdir -p /cre && touch /cre/versions.txt && \
8484
echo "$(date +'%F %R') \t crePython \t $CRE_VERSION" >> /cre/versions.txt && \
85-
echo "$(date +'%F %R') \t scipy \t $(python3 -c 'import scipy; print(scipy.__version__)')" >> /cre/versions.txt && \
86-
echo "$(date +'%F %R') \t statsmodels \t $(python3 -c 'import statsmodels; print(statsmodels.__version__)')" >> /cre/versions.txt && \
87-
echo "$(date +'%F %R') \t geopandas \t $(python3 -c 'import geopandas; print(geopandas.__version__)')" >> /cre/versions.txt && \
88-
echo "$(date +'%F %R') \t fiona \t $(python3 -c 'import fiona; print(fiona.__version__)')" >> /cre/versions.txt && \
89-
echo "$(date +'%F %R') \t beautifulsoup4 \t $(python3 -c 'import beautifulsoup4; print(beautifulsoup4.__version__)')" >> /cre/versions.txt && \
90-
echo "$(date +'%F %R') \t openCV \t $(python3 -c 'import cv2; print(cv2.__version__)')" >> /cre/versions.txt
85+
echo "$(date +'%F %R') \t scipy \t $(uv run python -c 'import scipy; print(scipy.__version__)')" >> /cre/versions.txt && \
86+
echo "$(date +'%F %R') \t statsmodels \t $(uv run python -c 'import statsmodels; print(statsmodels.__version__)')" >> /cre/versions.txt && \
87+
echo "$(date +'%F %R') \t geopandas \t $(uv run python -c 'import geopandas; print(geopandas.__version__)')" >> /cre/versions.txt && \
88+
echo "$(date +'%F %R') \t fiona \t $(uv run python -c 'import fiona; print(fiona.__version__)')" >> /cre/versions.txt && \
89+
echo "$(date +'%F %R') \t beautifulsoup4 \t $(uv run python -c 'import beautifulsoup4; print(beautifulsoup4.__version__)')" >> /cre/versions.txt && \
90+
echo "$(date +'%F %R') \t openCV \t $(uv run python -c 'import cv2; print(cv2.__version__)')" >> /cre/versions.txt
9191

9292

9393
COPY cre /cre

‎Dockerfile26‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ RUN apt-get update && apt-get -y --no-install-recommends install libspatialindex
2828
# install Python
2929
RUN apt-get update && apt-get -y --no-install-recommends install python3-dev python3-plotly && apt-get clean
3030
RUN apt-get -y --no-install-recommends install python3-scipy python3-h5py
31-
##RUN pip3 install --upgrade pip
32-
33-
#uv TODO
3431

3532
RUN uv pip install setuptools wheel psutil pipreqs arrow
3633
RUN uv pip install aiohttp asyncio

0 commit comments

Comments
 (0)