From 891b0b45e245be49ea51095e3edaf3d1dcf08921 Mon Sep 17 00:00:00 2001 From: anas mhana Date: Mon, 4 Apr 2022 15:30:46 +0200 Subject: [PATCH 01/16] add title for predicted data --- src/predict.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/predict.py b/src/predict.py index 4a85a35..b08a8d0 100644 --- a/src/predict.py +++ b/src/predict.py @@ -8,5 +8,5 @@ # load data that we want predictions for prediction_data = pd.read_csv('data/prediction-data.csv', sep=";") - +print('predicted data') print(trained_model.predict(prediction_data)) From 01bd11ec8a7e926599fc9b0527bf321ecb096beb Mon Sep 17 00:00:00 2001 From: anas mhana Date: Mon, 4 Apr 2022 15:47:49 +0200 Subject: [PATCH 02/16] change test --- src/predict.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/predict.py b/src/predict.py index b08a8d0..e7f62f8 100644 --- a/src/predict.py +++ b/src/predict.py @@ -8,5 +8,5 @@ # load data that we want predictions for prediction_data = pd.read_csv('data/prediction-data.csv', sep=";") -print('predicted data') +print('predicted data __hh') print(trained_model.predict(prediction_data)) From eda22f16557b0456ad0901e01530e36abd1bc999 Mon Sep 17 00:00:00 2001 From: anas mhana Date: Mon, 4 Apr 2022 16:23:57 +0200 Subject: [PATCH 03/16] remove commit --- src/predict.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/predict.py b/src/predict.py index e7f62f8..4a85a35 100644 --- a/src/predict.py +++ b/src/predict.py @@ -8,5 +8,5 @@ # load data that we want predictions for prediction_data = pd.read_csv('data/prediction-data.csv', sep=";") -print('predicted data __hh') + print(trained_model.predict(prediction_data)) From 4498731729a189ca499a94c8d3e5ce02f7a63237 Mon Sep 17 00:00:00 2001 From: anas mhana Date: Mon, 4 Apr 2022 16:31:32 +0200 Subject: [PATCH 04/16] remove commitm --- .github/workflows/production-deployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/production-deployment.yml b/.github/workflows/production-deployment.yml index 9694cc1..8e6772d 100644 --- a/.github/workflows/production-deployment.yml +++ b/.github/workflows/production-deployment.yml @@ -43,4 +43,4 @@ jobs: heroku_api_key: ${{secrets.HEROKU_API_KEY}} heroku_app_name: ${{secrets.HEROKU_APP_NAME}} heroku_email: ${{secrets.HEROKU_EMAIL}} - branch: "heroku" + branch: "heroku run -a anasm87mlbauen" From 51bebae2b8094864277f367034872dc36bf8fe02 Mon Sep 17 00:00:00 2001 From: anas mhana Date: Mon, 4 Apr 2022 16:34:26 +0200 Subject: [PATCH 05/16] remove commitm, --- .github/workflows/production-deployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/production-deployment.yml b/.github/workflows/production-deployment.yml index 8e6772d..9694cc1 100644 --- a/.github/workflows/production-deployment.yml +++ b/.github/workflows/production-deployment.yml @@ -43,4 +43,4 @@ jobs: heroku_api_key: ${{secrets.HEROKU_API_KEY}} heroku_app_name: ${{secrets.HEROKU_APP_NAME}} heroku_email: ${{secrets.HEROKU_EMAIL}} - branch: "heroku run -a anasm87mlbauen" + branch: "heroku" From b5bebdb5edbe7a74ab0e1749e8709bec9d21402f Mon Sep 17 00:00:00 2001 From: anas mhana Date: Mon, 4 Apr 2022 16:37:46 +0200 Subject: [PATCH 06/16] remove commitsfdfsd --- .github/workflows/production-deployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/production-deployment.yml b/.github/workflows/production-deployment.yml index 9694cc1..37e4bac 100644 --- a/.github/workflows/production-deployment.yml +++ b/.github/workflows/production-deployment.yml @@ -43,4 +43,4 @@ jobs: heroku_api_key: ${{secrets.HEROKU_API_KEY}} heroku_app_name: ${{secrets.HEROKU_APP_NAME}} heroku_email: ${{secrets.HEROKU_EMAIL}} - branch: "heroku" + branch: "heroku git:remote -a anasm87mlbauen" From c2d2b81597937a45a28bb58cf63a6d174ec87d6d Mon Sep 17 00:00:00 2001 From: anas mhana Date: Mon, 4 Apr 2022 16:40:17 +0200 Subject: [PATCH 07/16] remove commitsfdfsd jn --- src/predict.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/predict.py b/src/predict.py index 4a85a35..2c6b192 100644 --- a/src/predict.py +++ b/src/predict.py @@ -8,5 +8,4 @@ # load data that we want predictions for prediction_data = pd.read_csv('data/prediction-data.csv', sep=";") - print(trained_model.predict(prediction_data)) From dd9f303c81c4ad5749b0f41a175ca25dd242a30f Mon Sep 17 00:00:00 2001 From: anas mhana Date: Mon, 4 Apr 2022 17:01:46 +0200 Subject: [PATCH 08/16] remove commitsfdfsd jnjj --- .github/workflows/production-deployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/production-deployment.yml b/.github/workflows/production-deployment.yml index 37e4bac..cfe8de9 100644 --- a/.github/workflows/production-deployment.yml +++ b/.github/workflows/production-deployment.yml @@ -43,4 +43,4 @@ jobs: heroku_api_key: ${{secrets.HEROKU_API_KEY}} heroku_app_name: ${{secrets.HEROKU_APP_NAME}} heroku_email: ${{secrets.HEROKU_EMAIL}} - branch: "heroku git:remote -a anasm87mlbauen" + branch: "heroku git:remote --app anasm87mlbauen" From aad3fab8dbfc922de651f88e177b4bec8ac1e5f8 Mon Sep 17 00:00:00 2001 From: anas mhana Date: Mon, 4 Apr 2022 17:07:01 +0200 Subject: [PATCH 09/16] remove commitsfdfsd jnjllj --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 64761ba..7eee031 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ joblib==1.0.1 MarkupSafe==2.0.1 numpy==1.21.1 packaging==21.3 -pandas==1.3.1 +pandas==1.4.2 pluggy==1.0.0 py==1.11.0 pyparsing==3.0.6 From 27e75c07f6d5236f67a3e4f8e736d18cb93171fe Mon Sep 17 00:00:00 2001 From: anas mhana Date: Mon, 4 Apr 2022 17:21:51 +0200 Subject: [PATCH 10/16] remove commitsfdfsd jnjllssjlkj --- .github/workflows/production-deployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/production-deployment.yml b/.github/workflows/production-deployment.yml index cfe8de9..9694cc1 100644 --- a/.github/workflows/production-deployment.yml +++ b/.github/workflows/production-deployment.yml @@ -43,4 +43,4 @@ jobs: heroku_api_key: ${{secrets.HEROKU_API_KEY}} heroku_app_name: ${{secrets.HEROKU_APP_NAME}} heroku_email: ${{secrets.HEROKU_EMAIL}} - branch: "heroku git:remote --app anasm87mlbauen" + branch: "heroku" From d9da6b42cbaa0c48287ca2691c5f6e2d07bbc445 Mon Sep 17 00:00:00 2001 From: anas mhana Date: Mon, 4 Apr 2022 17:27:32 +0200 Subject: [PATCH 11/16] remove commitsfdfsd jnjllssjlkjd --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7eee031..b2d8923 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,7 +22,7 @@ python-dateutil==2.8.2 pytz==2021.1 requests==2.26.0 scikit-learn==0.24.2 -scipy==1.7.1 +scipy==1.8.0 six==1.16.0 threadpoolctl==2.2.0 toml==0.10.2 From e979ee78260f16d207df74872b5cdcfe4bba3eca Mon Sep 17 00:00:00 2001 From: anas mhana Date: Mon, 4 Apr 2022 17:33:32 +0200 Subject: [PATCH 12/16] remove commitsfdfsd jnjllssjlkjdll --- .github/workflows/production-deployment.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/production-deployment.yml b/.github/workflows/production-deployment.yml index 9694cc1..ddb2e34 100644 --- a/.github/workflows/production-deployment.yml +++ b/.github/workflows/production-deployment.yml @@ -9,13 +9,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Switch to heroku branch + - name: Switch to heroku1 branch shell: bash run: | git config --global user.email "" git config --global user.name "Github Actions" git fetch --all --unshallow - git checkout heroku 2>/dev/null || git checkout -b heroku + git checkout heroku1 2>/dev/null || git checkout -b heroku1 git merge main -X theirs --allow-unrelated-histories - name: Set up Python uses: actions/setup-python@v2 @@ -30,17 +30,17 @@ jobs: with: name: baummethoden_lr.pickle path: data/models/baummethoden_lr.pickle - - name: Push changes to heroku branch + - name: Push changes to heroku1 branch shell: bash run: | git add . git add --force data/models/baummethoden_lr.pickle git commit -m "[CI] update trained model" || echo "No changes to commit" - git push --set-upstream origin heroku - - name: Deploy to Heroku + git push --set-upstream origin heroku1 + - name: Deploy to Heroku1 uses: akhileshns/heroku-deploy@v3.12.12 with: heroku_api_key: ${{secrets.HEROKU_API_KEY}} heroku_app_name: ${{secrets.HEROKU_APP_NAME}} heroku_email: ${{secrets.HEROKU_EMAIL}} - branch: "heroku" + branch: "heroku1" From fc044d298c72127e8cd4d77999c0d6ab9c0e94d6 Mon Sep 17 00:00:00 2001 From: anas mhana Date: Mon, 4 Apr 2022 17:51:05 +0200 Subject: [PATCH 13/16] =?UTF-8?q?remove=20commitsfdfsd=20jnjllssjlkjdl?= =?UTF-8?q?=C3=B6=C3=B6l?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/production-deployment.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/production-deployment.yml b/.github/workflows/production-deployment.yml index ddb2e34..9694cc1 100644 --- a/.github/workflows/production-deployment.yml +++ b/.github/workflows/production-deployment.yml @@ -9,13 +9,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Switch to heroku1 branch + - name: Switch to heroku branch shell: bash run: | git config --global user.email "" git config --global user.name "Github Actions" git fetch --all --unshallow - git checkout heroku1 2>/dev/null || git checkout -b heroku1 + git checkout heroku 2>/dev/null || git checkout -b heroku git merge main -X theirs --allow-unrelated-histories - name: Set up Python uses: actions/setup-python@v2 @@ -30,17 +30,17 @@ jobs: with: name: baummethoden_lr.pickle path: data/models/baummethoden_lr.pickle - - name: Push changes to heroku1 branch + - name: Push changes to heroku branch shell: bash run: | git add . git add --force data/models/baummethoden_lr.pickle git commit -m "[CI] update trained model" || echo "No changes to commit" - git push --set-upstream origin heroku1 - - name: Deploy to Heroku1 + git push --set-upstream origin heroku + - name: Deploy to Heroku uses: akhileshns/heroku-deploy@v3.12.12 with: heroku_api_key: ${{secrets.HEROKU_API_KEY}} heroku_app_name: ${{secrets.HEROKU_APP_NAME}} heroku_email: ${{secrets.HEROKU_EMAIL}} - branch: "heroku1" + branch: "heroku" From 1705a7cc2c7ee7508ce5078c8a2202d4b1d73a19 Mon Sep 17 00:00:00 2001 From: anas mhana Date: Mon, 4 Apr 2022 18:17:46 +0200 Subject: [PATCH 14/16] =?UTF-8?q?remove=20commitsfdfsd=20jnjllssjlkjdl?= =?UTF-8?q?=C3=B6=C3=B6sl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/predict.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/predict.py b/src/predict.py index 2c6b192..1a36f51 100644 --- a/src/predict.py +++ b/src/predict.py @@ -5,7 +5,7 @@ file_to_open = open("data/models/baummethoden_lr.pickle", 'rb') trained_model = pickle.load(file_to_open) file_to_open.close() - +i =0 # load data that we want predictions for prediction_data = pd.read_csv('data/prediction-data.csv', sep=";") print(trained_model.predict(prediction_data)) From e75657ad1f3234d94c3d740ab89316ad00255dcc Mon Sep 17 00:00:00 2001 From: anas mhana Date: Mon, 4 Apr 2022 18:46:58 +0200 Subject: [PATCH 15/16] remove commitsfdfsdkjh --- .github/workflows/production-deployment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/production-deployment.yml b/.github/workflows/production-deployment.yml index 9694cc1..1919562 100644 --- a/.github/workflows/production-deployment.yml +++ b/.github/workflows/production-deployment.yml @@ -17,6 +17,7 @@ jobs: git fetch --all --unshallow git checkout heroku 2>/dev/null || git checkout -b heroku git merge main -X theirs --allow-unrelated-histories + git:remote -a anasm87mlbauen - name: Set up Python uses: actions/setup-python@v2 with: From 9e44142b2ae95ff1956a0651763955b515d57bb9 Mon Sep 17 00:00:00 2001 From: anas mhana Date: Mon, 4 Apr 2022 18:49:11 +0200 Subject: [PATCH 16/16] remove commitsfdfsdkjkh --- .github/workflows/production-deployment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/production-deployment.yml b/.github/workflows/production-deployment.yml index 1919562..9694cc1 100644 --- a/.github/workflows/production-deployment.yml +++ b/.github/workflows/production-deployment.yml @@ -17,7 +17,6 @@ jobs: git fetch --all --unshallow git checkout heroku 2>/dev/null || git checkout -b heroku git merge main -X theirs --allow-unrelated-histories - git:remote -a anasm87mlbauen - name: Set up Python uses: actions/setup-python@v2 with: