From 852a925c53ef41362ecf70c96939881d608fc766 Mon Sep 17 00:00:00 2001 From: nguyen duy anh Date: Sun, 6 Aug 2023 09:54:16 +0700 Subject: [PATCH 1/3] upgrade the version of dependencies --- components/get_data/conda.yml | 8 ++++---- conda.yml | 10 +++++----- config.yaml | 2 +- environment.yml | 22 +++++++++++----------- get_all_mlflow_env.sh | 1 + remove_all_mlflow_env.sh | 1 + 6 files changed, 23 insertions(+), 21 deletions(-) create mode 100755 get_all_mlflow_env.sh create mode 100755 remove_all_mlflow_env.sh diff --git a/components/get_data/conda.yml b/components/get_data/conda.yml index 6b6a9fae0..9a56baab2 100644 --- a/components/get_data/conda.yml +++ b/components/get_data/conda.yml @@ -3,9 +3,9 @@ channels: - conda-forge - defaults dependencies: - - pip=20.3.3 - - requests=2.24.0 - - mlflow=1.14.1 + - pip=23.2.1 + - requests=2.31.0 + - mlflow=2.5.0 - pip: - - wandb==0.10.31 + - wandb==0.15.8 - git+https://github.com/udacity/nd0821-c2-build-model-workflow-starter.git#egg=wandb-utils&subdirectory=components diff --git a/conda.yml b/conda.yml index 220ec0b90..d17b61ea6 100644 --- a/conda.yml +++ b/conda.yml @@ -3,9 +3,9 @@ channels: - conda-forge - defaults dependencies: - - mlflow=1.14.1 - - pyyaml=5.3.1 - - hydra-core=1.0.6 - - pip=20.3.3 + - mlflow=2.5.0 + - pyyaml=6.0 + - hydra-core=1.3.2 + - pip=23.2.1 - pip: - - wandb==0.10.31 \ No newline at end of file + - wandb==0.15.8 \ No newline at end of file diff --git a/config.yaml b/config.yaml index 39ca0482a..f96dad207 100644 --- a/config.yaml +++ b/config.yaml @@ -1,5 +1,5 @@ main: - components_repository: "https://github.com/udacity/build-ml-pipeline-for-short-term-rental-prices#components" + components_repository: "https://github.com/ngduyanhece/build-ml-pipeline-for-short-term-rental-prices#components" # All the intermediate files will be copied to this directory at the end of the run. # Set this to null if you are running in prod project_name: nyc_airbnb diff --git a/environment.yml b/environment.yml index efabac598..19dca1620 100644 --- a/environment.yml +++ b/environment.yml @@ -3,15 +3,15 @@ channels: - conda-forge - defaults dependencies: - - mlflow=1.14.1 - - ipython=7.21.0 - - notebook=6.2.0 - - jupyterlab=3.0.10 - - cookiecutter=1.7.2 - - hydra-core=1.0.6 - - matplotlib=3.3.4 - - pandas=1.2.3 - - git=2.30.2 - - pip=20.3.3 + - mlflow=2.5.0 + - ipython=8.14.0 + - notebook=7.0.2 + - jupyterlab=4.0.4 + - cookiecutter=2.3.0 + - hydra-core=1.3.2 + - matplotlib=3.7.2 + - pandas=2.0.3 + - git=2.41.0 + - pip=23.2.1 - pip: - - wandb==0.10.31 + - wandb==0.15.8 diff --git a/get_all_mlflow_env.sh b/get_all_mlflow_env.sh new file mode 100755 index 000000000..bf4995fe4 --- /dev/null +++ b/get_all_mlflow_env.sh @@ -0,0 +1 @@ +conda info --envs | grep mlflow | cut -f1 -d" " \ No newline at end of file diff --git a/remove_all_mlflow_env.sh b/remove_all_mlflow_env.sh new file mode 100755 index 000000000..9a5240673 --- /dev/null +++ b/remove_all_mlflow_env.sh @@ -0,0 +1 @@ +for e in $(conda info --envs | grep mlflow | cut -f1 -d" "); do conda uninstall --name $e --all -y;done \ No newline at end of file From 5529bf682d9f901a47c3449a3768c94a8fb8d88e Mon Sep 17 00:00:00 2001 From: nguyen duy anh Date: Sun, 6 Aug 2023 09:56:56 +0700 Subject: [PATCH 2/3] disable git workflow --- .github/workflows/manual.yml | 76 ++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml index bbfe56000..9643fe17c 100644 --- a/.github/workflows/manual.yml +++ b/.github/workflows/manual.yml @@ -1,46 +1,46 @@ # Workflow to ensure whenever a Github PR is submitted, # a JIRA ticket gets created automatically. -name: Manual Workflow +# name: Manual Workflow -# Controls when the action will run. -on: - # Triggers the workflow on pull request events but only for the master branch - pull_request_target: - types: [opened, reopened] +# # Controls when the action will run. +# on: +# # Triggers the workflow on pull request events but only for the master branch +# pull_request_target: +# types: [opened, reopened] - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: +# # Allows you to run this workflow manually from the Actions tab +# workflow_dispatch: -jobs: - test-transition-issue: - name: Convert Github Issue to Jira Issue - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@master +# jobs: +# test-transition-issue: +# name: Convert Github Issue to Jira Issue +# runs-on: ubuntu-latest +# steps: +# - name: Checkout +# uses: actions/checkout@master - - name: Login - uses: atlassian/gajira-login@master - env: - JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }} - JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }} - JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }} +# - name: Login +# uses: atlassian/gajira-login@master +# env: +# JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }} +# JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }} +# JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }} - - name: Create NEW JIRA ticket - id: create - uses: atlassian/gajira-create@master - with: - project: CONUPDATE - issuetype: Task - summary: | - Github PR nd0821 - Machine Learning DevOps Engineer | Repo: ${{ github.repository }} | PR# ${{github.event.number}} - description: | - Repo link: https://github.com/${{ github.repository }} - PR no. ${{ github.event.pull_request.number }} - PR title: ${{ github.event.pull_request.title }} - PR description: ${{ github.event.pull_request.description }} - In addition, please resolve other issues, if any. - fields: '{"components": [{"name":"nd0821 - Machine Learning DevOps Engineer"}], "customfield_16449":"https://classroom.udacity.com/", "customfield_16450":"Resolve the PR", "labels": ["github"], "priority":{"id": "4"}}' +# - name: Create NEW JIRA ticket +# id: create +# uses: atlassian/gajira-create@master +# with: +# project: CONUPDATE +# issuetype: Task +# summary: | +# Github PR nd0821 - Machine Learning DevOps Engineer | Repo: ${{ github.repository }} | PR# ${{github.event.number}} +# description: | +# Repo link: https://github.com/${{ github.repository }} +# PR no. ${{ github.event.pull_request.number }} +# PR title: ${{ github.event.pull_request.title }} +# PR description: ${{ github.event.pull_request.description }} +# In addition, please resolve other issues, if any. +# fields: '{"components": [{"name":"nd0821 - Machine Learning DevOps Engineer"}], "customfield_16449":"https://classroom.udacity.com/", "customfield_16450":"Resolve the PR", "labels": ["github"], "priority":{"id": "4"}}' - - name: Log created issue - run: echo "Issue ${{ steps.create.outputs.issue }} was created" +# - name: Log created issue +# run: echo "Issue ${{ steps.create.outputs.issue }} was created" From 6c45ccb2f28b3a151c574c0fe9cd22963c1b2e6a Mon Sep 17 00:00:00 2001 From: nguyen duy anh Date: Sun, 6 Aug 2023 10:02:32 +0700 Subject: [PATCH 3/3] upgrade dependencies --- components/conda.yml | 2 +- config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/conda.yml b/components/conda.yml index 6a97fdc6c..fac38660a 100644 --- a/components/conda.yml +++ b/components/conda.yml @@ -3,4 +3,4 @@ channels: - conda-forge - defaults dependencies: - - mlflow=1.14.1 + - mlflow=2.5.0 diff --git a/config.yaml b/config.yaml index f96dad207..ec4a11a5b 100644 --- a/config.yaml +++ b/config.yaml @@ -1,5 +1,5 @@ main: - components_repository: "https://github.com/ngduyanhece/build-ml-pipeline-for-short-term-rental-prices#components" + components_repository: "https://github.com/ngduyanhece/build-ml-pipeline-for-short-term-rental-prices/tree/eda#components" # All the intermediate files will be copied to this directory at the end of the run. # Set this to null if you are running in prod project_name: nyc_airbnb