Skip to content

Commit

Permalink
Merge b4305eb into 50633c5
Browse files Browse the repository at this point in the history
  • Loading branch information
submarcos authored Dec 15, 2022
2 parents 50633c5 + b4305eb commit 1ec1c53
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 11 deletions.
4 changes: 4 additions & 0 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ Bionic (Ubuntu 18.04) instances need to install deadsnakes PPA to handle python3
In preparation for HD Views developments (PR #3298)
- Bump Python to 3.8
- Bump MapEntity to 8.3.0
- Bump Pillow to 0.3.0
- Bump Celery to 5.2.1
- Bump django-celery-results to 2.4.0
- Bump django-clearcache to 1.2.1
- Add libvips to dependencies

2.94.0 (2022-12-12)
Expand Down
16 changes: 8 additions & 8 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile
#
Expand Down Expand Up @@ -30,7 +30,7 @@ cairosvg==2.5.2
# via
# geotrek (setup.py)
# weasyprint
celery[redis]==5.1.2
celery[redis]==5.2.7
# via
# django-celery-results
# geotrek (setup.py)
Expand All @@ -46,7 +46,7 @@ cffi==1.15.0
# weasyprint
charset-normalizer==2.0.12
# via requests
click==7.1.2
click==8.1.3
# via
# celery
# click-didyoumean
Expand Down Expand Up @@ -105,9 +105,9 @@ django-appconf==1.0.5
# via django-compressor
django-appypod==2.0.7
# via mapentity
django-celery-results==2.2.0
django-celery-results==2.4.0
# via geotrek (setup.py)
django-clearcache @ git+https://github.com/timonweb/django-clearcache.git@6de7994
django-clearcache==1.2.1
# via geotrek (setup.py)
django-colorfield==0.6.3
# via geotrek (setup.py)
Expand Down Expand Up @@ -198,7 +198,7 @@ itypes==1.2.0
# via coreapi
jinja2==3.0.3
# via coreschema
kombu==5.1.0
kombu==5.2.4
# via celery
landez==2.5.0
# via geotrek (setup.py)
Expand Down Expand Up @@ -232,7 +232,7 @@ persistent==4.9.0
# via
# btrees
# zodb
pillow==8.4.0
pillow==9.3.0
# via
# cairosvg
# django-colorfield
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def run(self):
'Django==3.2.*',
'mapentity==8.3.0',
'cairosvg',
'cairocffi==0.9.0', # Latest version dh-virtualenv can handle to build the .deb package
'cairocffi',
'env_file',
# pinned by requirements.txt
'pymemcache',
Expand All @@ -56,14 +56,14 @@ def run(self):
'xlrd',
'landez',
'celery[redis]',
'django-celery-results==2.2.*', # Latest version supporting python3.6
'django-celery-results',
'drf-extensions',
'django-colorfield',
'Fiona',
'markdown',
"weasyprint==52.5", # newer version required libpango (not available in bionic)
'django-weasyprint<2.0.0', # 2.10 require weasyprint > 53
"django-clearcache@git+https://github.com/timonweb/django-clearcache.git@6de7994#egg=django-clearcache", # commit working with py 3.6 and django 3.2
"django-clearcache",
# prod,
'gunicorn',
'sentry-sdk',
Expand Down

0 comments on commit 1ec1c53

Please sign in to comment.