Update pip requirements, and elasticsearch minor version

IATI · Sep 8, 2023 · c639125 · c639125
1 parent 625d327
commit c639125
Show file tree

Hide file tree

Showing 5 changed files with 208 additions and 159 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -45,11 +45,11 @@ RUN apk add --no-cache libmemcached-dev zlib-dev
 
 RUN apk add --no-cache openjdk8-jre su-exec
 
-ENV VERSION 6.8.21
+ENV VERSION 6.8.23
 ENV DOWNLOAD_URL "https://artifacts.elastic.co/downloads/elasticsearch"
 ENV ES_TARBAL "${DOWNLOAD_URL}/elasticsearch-oss-${VERSION}.tar.gz"
 # ENV EXPECTED_SHA_URL "${DOWNLOAD_URL}/elasticsearch-oss-${VERSION}.tar.gz.sha512"
-ENV ES_TARBALL_SHA "875b34db1458f51e1c738ef82a0c00aae7c558e0eb76c149d354d3be8695bb3d4397dddff9ab76cc111f1c4cb64b9767ac63cb15155007f4403e7ab930acd40a"
+ENV ES_TARBALL_SHA "14dbb2809b06499373c3ec5035d829d62255c2c93103618fbfe3d7d03cecf8847f654e83c78f765f23224126ff18ed713b959857e8ecf435c475b11bcd143d3f"
 RUN apk add --no-cache -t .build-deps wget ca-certificates gnupg openssl \
   && set -ex \
   && cd /tmp \

diff --git a/requirements.in b/requirements.in
@@ -1,26 +1,26 @@
-Babel==2.9.1
-beautifulsoup4==4.8.2
-bleach==3.3.0
-dj-database-url==0.5
-django-compressor==4.1
-django-extensions==3.1.3
-django-import-export==2.5.0
-django-haystack==3.0
-django-modeltranslation==0.17.2
-django-prettyjson==0.4.1
-django-recaptcha3==0.4.0
-django-storages[azure]==1.11.1
-django-widget-tweaks==1.4.8
-Django==3.2.4
-elasticsearch==6.8.2
-gunicorn==20.1.0
-opencensus-ext-azure==1.0.7
-opencensus-ext-django==0.7.4
-PyGithub==1.55
-psycopg2-binary==2.8.6
-requests==2.25.1
-wagtail-modeltranslation==0.13.0
+Babel
+beautifulsoup4
+bleach
+dj-database-url
+django-compressor
+django-extensions
+django-import-export
+django-haystack
+django-modeltranslation
+django-prettyjson
+django-recaptcha3
+django-storages[azure]
+django-widget-tweaks
+Django>=3.2,<3.3
+elasticsearch>=6.8,<7
+gunicorn
+opencensus-ext-azure
+opencensus-ext-django
+PyGithub
+psycopg2-binary
+requests
+wagtail-modeltranslation
 wagtail>=4.1,<4.2
-Wand==0.6.6
-whitenoise==5.2.0
-wrapt==1.11.*
+Wand
+whitenoise
+wrapt
diff --git a/requirements.txt b/requirements.txt
@@ -8,21 +8,22 @@ anyascii==0.3.2
     # via wagtail
 asgiref==3.7.2
     # via django
-azure-common==1.1.28
+azure-core==1.29.4
     # via
+    #   azure-identity
     #   azure-storage-blob
-    #   azure-storage-common
-azure-storage-blob==2.1.0
+    #   opencensus-ext-azure
+azure-identity==1.14.0
+    # via opencensus-ext-azure
+azure-storage-blob==12.17.0
     # via django-storages
-azure-storage-common==2.1.0
-    # via azure-storage-blob
-babel==2.9.1
+babel==2.12.1
     # via -r requirements.in
-beautifulsoup4==4.8.2
+beautifulsoup4==4.11.2
     # via
     #   -r requirements.in
     #   wagtail
-bleach==3.3.0
+bleach==6.0.0
     # via -r requirements.in
 cachetools==5.3.1
     # via google-auth
@@ -32,21 +33,26 @@ cffi==1.15.1
     # via
     #   cryptography
     #   pynacl
-chardet==4.0.0
+charset-normalizer==3.2.0
     # via requests
 cryptography==41.0.3
-    # via azure-storage-common
+    # via
+    #   azure-identity
+    #   azure-storage-blob
+    #   msal
+    #   pyjwt
 defusedxml==0.7.1
     # via odfpy
 deprecated==1.2.14
     # via pygithub
 diff-match-patch==20230430
     # via django-import-export
-dj-database-url==0.5.0
+dj-database-url==2.1.0
     # via -r requirements.in
-django==3.2.4
+django==3.2.21
     # via
     #   -r requirements.in
+    #   dj-database-url
     #   django-appconf
     #   django-extensions
     #   django-filter
@@ -65,19 +71,19 @@ django==3.2.4
     #   wagtail-modeltranslation
 django-appconf==1.0.5
     # via django-compressor
-django-compressor==4.1
+django-compressor==4.4
     # via -r requirements.in
-django-extensions==3.1.3
+django-extensions==3.2.3
     # via -r requirements.in
 django-filter==22.1
     # via wagtail
-django-haystack==3.0
+django-haystack==3.2.1
     # via -r requirements.in
-django-import-export==2.5.0
+django-import-export==3.2.0
     # via -r requirements.in
 django-modelcluster==6.0
     # via wagtail
-django-modeltranslation==0.17.2
+django-modeltranslation==0.18.11
     # via
     #   -r requirements.in
     #   wagtail-modeltranslation
@@ -87,13 +93,13 @@ django-prettyjson==0.4.1
     # via -r requirements.in
 django-recaptcha3==0.4.0
     # via -r requirements.in
-django-storages[azure]==1.11.1
+django-storages[azure]==1.14
     # via -r requirements.in
 django-taggit==3.1.0
     # via wagtail
 django-treebeard==4.7
     # via wagtail
-django-widget-tweaks==1.4.8
+django-widget-tweaks==1.5.0
     # via -r requirements.in
 djangorestframework==3.14.0
     # via wagtail
@@ -109,16 +115,24 @@ google-auth==2.22.0
     # via google-api-core
 googleapis-common-protos==1.60.0
     # via google-api-core
-gunicorn==20.1.0
+gunicorn==21.2.0
     # via -r requirements.in
 html5lib==1.1
     # via wagtail
-idna==2.10
+idna==3.4
     # via requests
+isodate==0.6.1
+    # via azure-storage-blob
 l18n==2021.3
     # via wagtail
 markuppy==1.14
     # via tablib
+msal==1.23.0
+    # via
+    #   azure-identity
+    #   msal-extensions
+msal-extensions==1.0.0
+    # via azure-identity
 odfpy==1.4.1
     # via tablib
 opencensus==0.11.2
@@ -127,25 +141,27 @@ opencensus==0.11.2
     #   opencensus-ext-django
 opencensus-context==0.1.3
     # via opencensus
-opencensus-ext-azure==1.0.7
+opencensus-ext-azure==1.1.9
     # via -r requirements.in
-opencensus-ext-django==0.7.4
+opencensus-ext-django==0.8.0
     # via -r requirements.in
 openpyxl==3.1.2
     # via
     #   tablib
     #   wagtail
 packaging==23.1
-    # via bleach
+    # via gunicorn
 pillow==9.5.0
     # via wagtail
-protobuf==4.24.2
+portalocker==2.7.0
+    # via msal-extensions
+protobuf==4.24.3
     # via
     #   google-api-core
     #   googleapis-common-protos
 psutil==5.9.5
     # via opencensus-ext-azure
-psycopg2-binary==2.8.6
+psycopg2-binary==2.9.7
     # via -r requirements.in
 pyasn1==0.5.0
     # via
@@ -155,14 +171,14 @@ pyasn1-modules==0.3.0
     # via google-auth
 pycparser==2.21
     # via cffi
-pygithub==1.55
+pygithub==1.59.1
     # via -r requirements.in
-pyjwt==2.8.0
-    # via pygithub
+pyjwt[crypto]==2.8.0
+    # via
+    #   msal
+    #   pygithub
 pynacl==1.5.0
     # via pygithub
-python-dateutil==2.8.2
-    # via azure-storage-common
 pytz==2023.3.post1
     # via
     #   babel
@@ -172,30 +188,31 @@ pytz==2023.3.post1
     #   l18n
 pyyaml==6.0.1
     # via tablib
-rcssmin==1.1.0
+rcssmin==1.1.1
     # via django-compressor
-requests==2.25.1
+requests==2.31.0
     # via
     #   -r requirements.in
-    #   azure-storage-common
+    #   azure-core
     #   django-recaptcha3
     #   google-api-core
+    #   msal
     #   opencensus-ext-azure
     #   pygithub
     #   wagtail
-rjsmin==1.2.0
+rjsmin==1.2.1
     # via django-compressor
 rsa==4.9
     # via google-auth
 six==1.16.0
     # via
+    #   azure-core
     #   bleach
-    #   django-modeltranslation
     #   django-prettyjson
     #   google-auth
     #   html5lib
+    #   isodate
     #   l18n
-    #   python-dateutil
 soupsieve==2.5
     # via beautifulsoup4
 sqlparse==0.4.4
@@ -207,7 +224,12 @@ tablib[html,ods,xls,xlsx,yaml]==3.5.0
 telepath==0.3.1
     # via wagtail
 typing-extensions==4.7.1
-    # via asgiref
+    # via
+    #   asgiref
+    #   azure-core
+    #   azure-storage-blob
+    #   dj-database-url
+    #   django-modeltranslation
 urllib3==1.26.16
     # via
     #   elasticsearch
@@ -217,26 +239,23 @@ wagtail==4.1.6
     # via
     #   -r requirements.in
     #   wagtail-modeltranslation
-wagtail-modeltranslation==0.13.0
+wagtail-modeltranslation==0.14.1
     # via -r requirements.in
-wand==0.6.6
+wand==0.6.11
     # via -r requirements.in
 webencodings==0.5.1
     # via
     #   bleach
     #   html5lib
-whitenoise==5.2.0
+whitenoise==6.5.0
     # via -r requirements.in
 willow==1.4.1
     # via wagtail
-wrapt==1.11.2
+wrapt==1.15.0
     # via
     #   -r requirements.in
     #   deprecated
 xlrd==2.0.1
     # via tablib
 xlwt==1.3.0
     # via tablib
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools
diff --git a/requirements_dev.in b/requirements_dev.in
@@ -1,16 +1,16 @@
 -r requirements.in
-attrs==21.2.0
-pytest==7.1.1
-pytest-django==4.5.2
-pytest-timeout==2.1.0
-splinter==0.14.0
-pytest-splinter==3.3.1
-responses==0.13.3
-flake8==3.9.2
-pydocstyle==6.0.0
-pylint==2.4.4
-pylint-django==2.0.13
-wagtail-factories==3.1.0
-factory-boy==3.2.1
-sqlparse==0.4.2
-django-debug-toolbar==3.5.0
+attrs
+pytest
+pytest-django
+pytest-timeout
+splinter
+pytest-splinter
+responses
+flake8
+pydocstyle
+pylint
+pylint-django
+wagtail-factories
+factory-boy
+sqlparse
+django-debug-toolbar