fix conflicts from pull

.drone.yml

@@ -0,0 +1,31 @@
+kind: pipeline
+type: docker
+name: Pow
+
+trigger:
+  event:
+    - push
+
+steps:
+
+  - name: build-pow
+    image: plugins/docker
+    settings:
+      dockerfile: ./src/Dockerfile
+      context: ./src
+      registry: hub.codefirst.iut.uca.fr
+      repo: hub.codefirst.iut.uca.fr/dorian.hodin/pow
+      username:
+        from_secret: SECRET_USERNAME
+      password:
+        from_secret: SECRET_PASSWD
+
+  - name: deploy-pow
+    image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest
+    environment:
+      IMAGENAME: hub.codefirst.iut.uca.fr/dorian.hodin/pow:latest
+      CONTAINERNAME: pow
+      COMMAND: create
+      OVERWRITE: true
+      ADMINS: dorianhodin,aurianjault,remiarnal
+    depends_on: [ build-pow ]

.gitignore

@@ -159,4 +159,4 @@ cython_debug/
 #  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
+#.idea/

src/Dockerfile

@@ -0,0 +1,11 @@
+FROM python:3.9
+
+WORKDIR /app
+COPY . .
+
+RUN pip install --upgrade pip
+RUN pip install streamlit matplotlib pandas scikit-learn
+
+EXPOSE 8501
+
+ENTRYPOINT ["streamlit", "run", "home.py", "--server.port=8501", "--server.address=0.0.0.0"]

src/back/load_csv.py

@@ -2,6 +2,7 @@ import pandas as pd
 import numpy  as np
 import matplotlib.pyplot as plt
 
+<<<<<<< HEAD
 def return_csv(path):
     df = pd.read_csv(path)
     return df
@@ -13,7 +14,6 @@ def csv_value(df):
     print(df.isna().sum())
     # Useless values
 
-
 def csv_check(df):
     for col in df:
         print("-"*12)