From 5975bede3c9f39a6bd8f4f2074f979becbc841c3 Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Wed, 19 Jul 2023 13:49:46 +0100
Subject: [PATCH] getting deployment working

---
 backend/requirements/base.txt            | 3 +--
 model_data/Property.py                   | 5 +++--
 model_data/requirements/dev.txt          | 1 +
 model_data/requirements/requirements.txt | 8 +-------
 model_data/requirements/static.txt       | 7 ++++++-
 serverless.yml                           | 1 +
 serverless_requirements.txt              | 9 +--------
 7 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/backend/requirements/base.txt b/backend/requirements/base.txt
index 5a1693c4..cab350c7 100644
--- a/backend/requirements/base.txt
+++ b/backend/requirements/base.txt
@@ -24,5 +24,4 @@ typing_extensions==4.7.1
 uvicorn==0.22.0
 uvloop==0.17.0
 watchfiles==0.19.0
-websockets==11.0.3
-boto3
\ No newline at end of file
+websockets==11.0.3
\ No newline at end of file
diff --git a/model_data/Property.py b/model_data/Property.py
index 98b7a0b0..9fb46639 100644
--- a/model_data/Property.py
+++ b/model_data/Property.py
@@ -1,4 +1,4 @@
-import pandas as pd
+from datetime import datetime
 import re
 from epc_api.client import EpcClient
 from model_data.config import EPC_AUTH_TOKEN
@@ -130,7 +130,8 @@ class Property(BaseUtility):
         """
 
         if self.full_sap_epc:
-            self.year_built = pd.to_datetime(self.full_sap_epc["lodgement-date"]).year
+            self.year_built = datetime.strptime(self.full_sap_epc["lodgement-date"], '%Y-%m-%d').year
+
             return
 
         if self.data["construction-age-band"] not in self.DATA_ANOMALY_MATCHES:
diff --git a/model_data/requirements/dev.txt b/model_data/requirements/dev.txt
index c48188c6..9b941c18 100644
--- a/model_data/requirements/dev.txt
+++ b/model_data/requirements/dev.txt
@@ -4,3 +4,4 @@ mock
 pytest-cov
 pytest-mock
 pip-check-reqs
+seaborn
diff --git a/model_data/requirements/requirements.txt b/model_data/requirements/requirements.txt
index 42e3e369..09572e62 100644
--- a/model_data/requirements/requirements.txt
+++ b/model_data/requirements/requirements.txt
@@ -1,5 +1,3 @@
-pandas==2.0.3
-numpy==1.25.1
 pytz==2023.3
 tzdata==2023.3
 epc-api-python==1.0.2
@@ -11,9 +9,5 @@ dbfread
 pyproj
 pint
 mip
-seaborn
-statsmodels
-scikit-learn
 pyspellchecker
-textblob
-xgboost
\ No newline at end of file
+textblob
\ No newline at end of file
diff --git a/model_data/requirements/static.txt b/model_data/requirements/static.txt
index b9b8e7c5..e2ffa2ce 100644
--- a/model_data/requirements/static.txt
+++ b/model_data/requirements/static.txt
@@ -1 +1,6 @@
-geopandas
\ No newline at end of file
+geopandas
+xgboost
+statsmodels
+scikit-learn
+pandas==2.0.3
+numpy==1.25.1
\ No newline at end of file
diff --git a/serverless.yml b/serverless.yml
index b91a7371..81aab643 100644
--- a/serverless.yml
+++ b/serverless.yml
@@ -21,6 +21,7 @@ package:
   #    - model_data/**
   exclude:
     - model_data/local_data/**
+    - model_data/tests/**
     - infrastructure/**
     - data_collection/**
     - node_modules/**
diff --git a/serverless_requirements.txt b/serverless_requirements.txt
index 762019ef..579cd5af 100644
--- a/serverless_requirements.txt
+++ b/serverless_requirements.txt
@@ -25,9 +25,6 @@ uvicorn==0.22.0
 uvloop==0.17.0
 watchfiles==0.19.0
 websockets==11.0.3
-boto3
-pandas==2.0.3
-numpy==1.25.1
 pytz==2023.3
 tzdata==2023.3
 epc-api-python==1.0.2
@@ -39,9 +36,5 @@ dbfread
 pyproj
 pint
 mip
-seaborn
-statsmodels
-scikit-learn
 pyspellchecker
-textblob
-xgboost
\ No newline at end of file
+textblob
\ No newline at end of file