Merge pull request #12 from SEI-TAS/dev

Dev
SEI-TAS · May 18, 2023 · 5ab38a4 · 5ab38a4
2 parents b5869f8 + 2f2c602
commit 5ab38a4
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 387 deletions.
diff --git a/plugins/WeMoInsight/api/.gitignore b/plugins/WeMoInsight/api/.gitignore
@@ -0,0 +1,2 @@
+__pycache__
+.venv
diff --git a/plugins/WeMoInsight/api/Dockerfile b/plugins/WeMoInsight/api/Dockerfile
@@ -1,14 +1,16 @@
-FROM python:2.7-alpine
+FROM python:3.11-alpine
 
-RUN pip install pipenv==2018.11.26
+# Trusted host configs used to avoid issues when running behind SSL proxies.
+RUN pip config set global.trusted-host "pypi.org pypi.python.org files.pythonhosted.org"
+RUN sed -ie "s/https/http/g" /etc/apk/repositories
 
 # Installing Python deps without a venv (not needed in container).
-COPY Pipfile /plugins/wemo/
-COPY Pipfile.lock /plugins/wemo/
+COPY requirements.txt /plugins/wemo/
 WORKDIR /plugins/wemo/
 RUN apk --no-cache add build-base libffi-dev bash && \
-    pipenv install --system --deploy --ignore-pipfile && \
+    pip install -r requirements.txt --default-timeout=100 && \
     apk del build-base libffi-dev
+RUN apk add --no-cache libstdc++
 
 # API is listening here.
 EXPOSE 7501

diff --git a/plugins/WeMoInsight/api/Pipfile b/plugins/WeMoInsight/api/Pipfile
@@ -5,10 +5,10 @@ name = "pypi"
 
 [packages]
 ouimeaux = "==0.8.2"
-flask = "==1.1.2"
-flask-restful = "==0.3.8"
+flask = "==2.3.2"
+flask-restful = "==0.3.9"
 
 [dev-packages]
 
 [requires]
-python_version = "2.7"
+python_version = "3.11"