Skip to content

Commit

Permalink
fix rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
submarcos committed Mar 29, 2024
1 parent 1f90661 commit a693107
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 2 deletions.
15 changes: 15 additions & 0 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ chardet==5.2.0
# via
# -c requirements.txt
# geotrek (pyproject.toml)
# reportlab
charset-normalizer==3.2.0
# via
# -c requirements.txt
Expand Down Expand Up @@ -129,6 +130,7 @@ cssselect2==0.7.0
# via
# -c requirements.txt
# cairosvg
# svglib
# weasyprint
datetime==5.2
# via
Expand Down Expand Up @@ -276,6 +278,7 @@ drf-yasg==1.21.5
easy-thumbnails==2.8.5
# via
# -c requirements.txt
# geotrek (pyproject.toml)
# mapentity
# paperclip
env-file==2020.12.3
Expand Down Expand Up @@ -364,6 +367,7 @@ lxml==4.9.3
# -c requirements.txt
# geotrek (pyproject.toml)
# mapentity
# svglib
mapentity==8.7.2
# via
# -c requirements.txt
Expand Down Expand Up @@ -426,6 +430,7 @@ pillow==10.2.0
# geotrek (pyproject.toml)
# large-image
# paperclip
# reportlab
# weasyprint
pip-tools==7.3.0
# via geotrek (pyproject.toml)
Expand Down Expand Up @@ -506,6 +511,11 @@ redis==4.5.4
# via
# -c requirements.txt
# geotrek (pyproject.toml)
reportlab==4.1.0
# via
# -c requirements.txt
# easy-thumbnails
# svglib
requests==2.31.0
# via
# -c requirements.txt
Expand Down Expand Up @@ -554,6 +564,10 @@ sqlparse==0.4.4
# -c requirements.txt
# django
# django-debug-toolbar
svglib==1.5.1
# via
# -c requirements.txt
# easy-thumbnails
tif2geojson==0.1.3
# via
# -c requirements.txt
Expand All @@ -563,6 +577,7 @@ tinycss2==1.2.1
# -c requirements.txt
# cairosvg
# cssselect2
# svglib
# weasyprint
tomli==2.0.1
# via
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ dependencies = [
"weasyprint==52.5",
'django-weasyprint<2.0.0',
"django-clearcache",
"easy-thumbnails[svg]",
"pyopenair",
'gunicorn',
'sentry-sdk',
Expand Down
18 changes: 16 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ cffi==1.16.0
# pyvips
# weasyprint
chardet==5.2.0
# via geotrek (pyproject.toml)
# via
# geotrek (pyproject.toml)
# reportlab
charset-normalizer==3.2.0
# via requests
click==8.1.3
Expand Down Expand Up @@ -85,6 +87,7 @@ coreschema==0.0.4
cssselect2==0.7.0
# via
# cairosvg
# svglib
# weasyprint
datetime==5.2
# via appy
Expand Down Expand Up @@ -174,6 +177,7 @@ drf-yasg==1.21.5
# geotrek (pyproject.toml)
easy-thumbnails==2.8.5
# via
# geotrek (pyproject.toml)
# mapentity
# paperclip
env-file==2020.12.3
Expand Down Expand Up @@ -217,7 +221,9 @@ large-image==1.20.3
large-image-source-vips==1.17.2
# via geotrek (pyproject.toml)
lxml==4.9.3
# via mapentity
# via
# mapentity
# svglib
mapentity==8.7.2
# via geotrek (pyproject.toml)
markdown==3.4.4
Expand Down Expand Up @@ -258,6 +264,7 @@ pillow==10.2.0
# geotrek (pyproject.toml)
# large-image
# paperclip
# reportlab
# weasyprint
prompt-toolkit==3.0.39
# via click-repl
Expand Down Expand Up @@ -297,6 +304,10 @@ rcssmin==1.1.1
# via django-compressor
redis==4.5.4
# via geotrek (pyproject.toml)
reportlab==4.1.0
# via
# easy-thumbnails
# svglib
requests==2.31.0
# via
# coreapi
Expand Down Expand Up @@ -326,12 +337,15 @@ soupsieve==2.5
# via beautifulsoup4
sqlparse==0.4.4
# via django
svglib==1.5.1
# via easy-thumbnails
tif2geojson==0.1.3
# via geotrek (pyproject.toml)
tinycss2==1.2.1
# via
# cairosvg
# cssselect2
# svglib
# weasyprint
transaction==3.1.0
# via zodb
Expand Down

0 comments on commit a693107

Please sign in to comment.