From 90765d0436e84de7f84f7f045dea08c13f049974 Mon Sep 17 00:00:00 2001 From: Mustafa Abdulrahman Date: Mon, 28 Aug 2023 10:54:52 -0400 Subject: [PATCH 1/6] make minor change --> test install script --- openadapt/privacy/__init__.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/openadapt/privacy/__init__.py b/openadapt/privacy/__init__.py index d58acf990..6756f19bc 100644 --- a/openadapt/privacy/__init__.py +++ b/openadapt/privacy/__init__.py @@ -1,4 +1 @@ -"""Package for the Privacy API. - -Module: __init__.py -""" +"""Package for the Privacy API.""" From 630125ce9614673e1dcf1a6af2d159c5c35d5cd5 Mon Sep 17 00:00:00 2001 From: Mustafa Abdulrahman Date: Mon, 28 Aug 2023 11:46:31 -0400 Subject: [PATCH 2/6] comment out defaults --- install/install_openadapt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/install_openadapt.sh b/install/install_openadapt.sh index 187438548..77ff7aa04 100644 --- a/install/install_openadapt.sh +++ b/install/install_openadapt.sh @@ -10,8 +10,8 @@ pythonVerStr="Python 3.10*" pythonInstallerLoc="https://www.python.org/ftp/python/3.10.11/python-3.10.11-macos11.pkg" # Set default values or use provided values -BRANCH=${BRANCH:-main} -REPO=${REPO:-https://github.com/MLDSAI/OpenAdapt.git} +# BRANCH=${BRANCH:-main} +# REPO=${REPO:-https://github.com/MLDSAI/OpenAdapt.git} ################################ HELPER FUNCTIONS ################################ From 037e094f63a882316cca130701320f6ec73347c3 Mon Sep 17 00:00:00 2001 From: Mustafa Abdulrahman Date: Mon, 28 Aug 2023 11:55:49 -0400 Subject: [PATCH 3/6] rearrange arguments in main.yml --- .github/workflows/main.yml | 3 ++- install/install_openadapt.sh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d35639b10..bd6cf8d5a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,6 +29,7 @@ jobs: - name: Run tests using the shell script (macOS compatible). if: matrix.os == 'macos-latest' run: | + sh install/install_openadapt.sh + SKIP_POETRY_SHELL=1 REPO="${{ github.event.pull_request.head.repo.full_name }}" # Using full_name for repository BRANCH="${{ github.event.pull_request.head.ref }}" # Using ref for branch - SKIP_POETRY_SHELL=1 sh install/install_openadapt.sh diff --git a/install/install_openadapt.sh b/install/install_openadapt.sh index 77ff7aa04..187438548 100644 --- a/install/install_openadapt.sh +++ b/install/install_openadapt.sh @@ -10,8 +10,8 @@ pythonVerStr="Python 3.10*" pythonInstallerLoc="https://www.python.org/ftp/python/3.10.11/python-3.10.11-macos11.pkg" # Set default values or use provided values -# BRANCH=${BRANCH:-main} -# REPO=${REPO:-https://github.com/MLDSAI/OpenAdapt.git} +BRANCH=${BRANCH:-main} +REPO=${REPO:-https://github.com/MLDSAI/OpenAdapt.git} ################################ HELPER FUNCTIONS ################################ From 6da6a5a7bc2a7846480be1817316e987405c2464 Mon Sep 17 00:00:00 2001 From: Mustafa Abdulrahman Date: Mon, 28 Aug 2023 12:12:06 -0400 Subject: [PATCH 4/6] update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8d60ea8d6..c1931eb94 100644 --- a/README.md +++ b/README.md @@ -277,7 +277,7 @@ To set up the pre-commit hooks, follow these steps: pre-commit install ``` -Now, the pre-commit hooks are installed and will run automatically before each commit. They will enforce code quality standards and prevent committing code that doesn't pass the defined checks. +Now, the pre-commit hooks are installed and will run automatically before each commit. They will enforce code quality standards and prevent committing code that doesn't pass the defined checks. Please ensure to use the `black --preview .` if running black manually. # Submitting an Issue From 027feb0ae46b7a398bc57f1c14c75ec9858c8328 Mon Sep 17 00:00:00 2001 From: Mustafa Abdulrahman Date: Mon, 28 Aug 2023 13:01:53 -0400 Subject: [PATCH 5/6] small change --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c1931eb94..10c81fbc8 100644 --- a/README.md +++ b/README.md @@ -129,7 +129,7 @@ Visualize the latest recording you created by running the following command: python -m openadapt.visualize ``` -This will open your browser. It will look something like this: +This will open your browser. It will look like this: ![image](https://github.com/OpenAdaptAI/OpenAdapt/assets/774615/5d7253b7-ae12-477c-94a3-b388e4f37587) From f442ff6c4e8bcfb4be2065d18dd7b1ddb5e3e166 Mon Sep 17 00:00:00 2001 From: Mustafa Abdulrahman Date: Mon, 28 Aug 2023 15:07:36 -0400 Subject: [PATCH 6/6] add default values when no parameter is passed --- install/install_openadapt.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/install/install_openadapt.sh b/install/install_openadapt.sh index 2986bc9ca..e411fc4b6 100644 --- a/install/install_openadapt.sh +++ b/install/install_openadapt.sh @@ -9,7 +9,10 @@ pythonCmd="python3.10" pythonVerStr="Python 3.10*" pythonInstallerLoc="https://www.python.org/ftp/python/3.10.11/python-3.10.11-macos11.pkg" -# Construct the repository URL +# Set default values when no parameters are provided +BRANCH=${BRANCH:-main} +REPO=${REPO:-https://github.com/MLDSAI/OpenAdapt.git} + REPO_URL="https://github.com/$REPO" ################################ HELPER FUNCTIONS ################################