fix Merge conflict

Author: bidoubiwa

Dockerfile

@@ -1,21 +1,17 @@
-FROM python:3.8.4-buster
+FROM python:3.10.8-slim-bullseye
 
 ENV LC_ALL C.UTF-8
 ENV LANG C.UTF-8
 
 WORKDIR /docs-scraper
 
-RUN apt-get update -y \
-    && apt-get install -y python3-pip libnss3 \
-    && apt-get install -y chromium-driver
+RUN apt-get update -y && apt-get install -y python3-pip libnss3 chromium-driver
 
 RUN pip3 install pipenv
 
-
 COPY Pipfile Pipfile
-COPY Pipfile.lock Pipfile.lock 
-
-RUN pipenv --python 3.8 install
+COPY Pipfile.lock Pipfile.lock
 
+RUN pipenv install
 
-COPY . . 
+COPY . .

Pipfile

@@ -5,14 +5,15 @@ name = "pypi"
 
 [packages]
 Scrapy = "==2.7.1"
-selenium = "==4.6.0"
-pytest = "==7.1.3"
-meilisearch = "==0.22.1"
+selenium = "==4.6.1"
+meilisearch = "==0.23.0"
 requests-iap = "==0.2.0"
 python-keycloak-client = "==0.2.3"
+requests = "==2.28.1"
 
 [dev-packages]
+pytest = "==7.1.3"
 pylint = "==2.15.7"
-tox = "==3.27.0"
+tox = "==3.27.1"
 tox-pipenv = "==1.10.1"
 wrapt = "*"

Pipfile.lock

@@ -523,7 +523,7 @@ Websites that need JavaScript for rendering are passed through ChromeDriver.<br>
 
 ## 🤖 Compatibility with Meilisearch
 
-This package only guarantees the compatibility with the [version v0.29.0 of Meilisearch](https://github.com/meilisearch/meilisearch/releases/tag/v0.29.0).
+This package only guarantees the compatibility with the [version v0.30.0 of Meilisearch](https://github.com/meilisearch/meilisearch/releases/tag/v0.30.0).
 
 ## ⚙️ Development Workflow and Contributing