From 40a30972fec74830068dc5cc406696cd0059bd35 Mon Sep 17 00:00:00 2001 From: Omry Yadan Date: Tue, 4 Jun 2024 13:23:52 +0800 Subject: [PATCH 1/8] remove pytest-snail from dev requirements file fixes #2908 --- requirements/dev.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index a99a52bd99..777337ae83 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -12,7 +12,6 @@ packaging pre-commit pytest pytest-benchmark -pytest-snail read-version setuptools towncrier From f0d94494b46678e630c4dc3f454efff981625de3 Mon Sep 17 00:00:00 2001 From: Omry Yadan Date: Tue, 4 Jun 2024 15:46:09 +0800 Subject: [PATCH 2/8] increased windows no-output timeout to 20m --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8ee8f9c0df..b6355014cf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -167,7 +167,7 @@ jobs: py_version: << parameters.py_version >> - run: name: Testing Hydra - no_output_timeout: 10m + no_output_timeout: 20m command: | $env:NOX_PYTHON_VERSIONS="<< parameters.py_version >>" $env:ConEmuDefaultCp=65001 From 503f6dfbe673c3b5b38da4be0db11a605f4c8e91 Mon Sep 17 00:00:00 2001 From: Omry Yadan Date: Tue, 4 Jun 2024 17:53:33 +0800 Subject: [PATCH 3/8] fixed plugins bandit warnings --- .../integration_test_tools/create_integration_test_ami.py | 2 +- .../integration_test_tools/setup_integration_test_ami.py | 2 +- plugins/hydra_ray_launcher/tests/test_ray_aws_launcher.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/hydra_ray_launcher/integration_test_tools/create_integration_test_ami.py b/plugins/hydra_ray_launcher/integration_test_tools/create_integration_test_ami.py index dc2ab834e7..1f5bdc67a7 100644 --- a/plugins/hydra_ray_launcher/integration_test_tools/create_integration_test_ami.py +++ b/plugins/hydra_ray_launcher/integration_test_tools/create_integration_test_ami.py @@ -24,7 +24,7 @@ def _run_command(command: str) -> str: print(f"{str(datetime.now())} - Running: {command}") - output = subprocess.getoutput(command) + output = subprocess.getoutput(command) # nosec B605 print(f"{str(datetime.now())} - {output}") return output diff --git a/plugins/hydra_ray_launcher/integration_test_tools/setup_integration_test_ami.py b/plugins/hydra_ray_launcher/integration_test_tools/setup_integration_test_ami.py index f114e67b42..a49fccd692 100644 --- a/plugins/hydra_ray_launcher/integration_test_tools/setup_integration_test_ami.py +++ b/plugins/hydra_ray_launcher/integration_test_tools/setup_integration_test_ami.py @@ -16,7 +16,7 @@ def _run_command(command: str) -> str: print(f"{str( datetime.now() )} - OUT: {command}") - output = subprocess.getoutput(command) + output = subprocess.getoutput(command) # nosec B605 print(f"{str( datetime.now() )} - OUT: {output}") return output diff --git a/plugins/hydra_ray_launcher/tests/test_ray_aws_launcher.py b/plugins/hydra_ray_launcher/tests/test_ray_aws_launcher.py index c06aa2c67e..82cb1f0608 100644 --- a/plugins/hydra_ray_launcher/tests/test_ray_aws_launcher.py +++ b/plugins/hydra_ray_launcher/tests/test_ray_aws_launcher.py @@ -129,7 +129,7 @@ def run_command(commands: str) -> str: log.info(f"running: {commands}") - output = subprocess.getoutput(commands) + output = subprocess.getoutput(commands) # nosec B605 log.info(f"outputs: {output}") return output From 05bddbf006751c5c850dae73e4beba8d04b3ced1 Mon Sep 17 00:00:00 2001 From: Omry Yadan Date: Tue, 4 Jun 2024 17:53:43 +0800 Subject: [PATCH 4/8] minor changes to noxfile and circle config --- .circleci/config.yml | 3 ++- noxfile.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b6355014cf..5cf84a36cc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -98,6 +98,7 @@ commands: key: -<< pipeline.parameters.cache_key_version >>-win-sys-{{ .Branch }}-<< parameters.py_version >> - run: name: Preparing environment - system + no_output_timeout: 20m command: | choco install -y --no-progress miniconda3 choco install -y --no-progress openssl openjdk11jre @@ -167,7 +168,7 @@ jobs: py_version: << parameters.py_version >> - run: name: Testing Hydra - no_output_timeout: 20m + no_output_timeout: 10m command: | $env:NOX_PYTHON_VERSIONS="<< parameters.py_version >>" $env:ConEmuDefaultCp=65001 diff --git a/noxfile.py b/noxfile.py index 30a27a1f1c..442356b1c0 100644 --- a/noxfile.py +++ b/noxfile.py @@ -87,13 +87,13 @@ def print_installed_package_version(session: Session, package_name: str) -> None pip_list: str = session.run("pip", "list", silent=True) for line in pip_list.split("\n"): if package_name in line: - print(f"Installed {package_name} version: {line}") + logger.info(f"Installed {package_name} version: {line}") def install_hydra(session: Session, cmd: List[str]) -> None: # needed for build session.install("read-version", silent=SILENT) - # clean install hydra + # clean-install hydra session.chdir(BASE) if USE_OMEGACONF_DEV_VERSION: session.install("--pre", "omegaconf", silent=SILENT) From f82ecbcaad26baddd2410cdfe24ce769d7b368e8 Mon Sep 17 00:00:00 2001 From: Omry Yadan Date: Tue, 4 Jun 2024 19:58:40 +0800 Subject: [PATCH 5/8] upgrading openjdk in Windows and removing openssl --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5cf84a36cc..e28555e921 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -101,7 +101,7 @@ commands: no_output_timeout: 20m command: | choco install -y --no-progress miniconda3 - choco install -y --no-progress openssl openjdk11jre + choco install -y --no-progress openjdk C:\tools\miniconda3\Scripts\conda.exe init powershell - run: name: Preparing environment - Hydra From bb26db78adaab8be3673e82b9a3ba1c95acca98c Mon Sep 17 00:00:00 2001 From: Omry Yadan Date: Fri, 7 Jun 2024 21:53:28 +0800 Subject: [PATCH 6/8] Fixing macos by untapping broken brew casks --- .circleci/config.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e28555e921..1a574c10c9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -46,6 +46,9 @@ commands: - run: name: Preparing environment - Brew command: | + brew --version + brew untap Homebrew/homebrew-cask-versions + brew untap adoptopenjdk/openjdk brew update brew upgrade git brew install fish @@ -120,7 +123,7 @@ jobs: py_version: type: string macos: - xcode: "13.4.1" + xcode: "15.3.0" steps: - macos: py_version: << parameters.py_version >> From 47fb80069966bc8d9c2a596c86eee52d4ab493c1 Mon Sep 17 00:00:00 2001 From: Omry Yadan Date: Wed, 19 Jun 2024 13:44:30 +0800 Subject: [PATCH 7/8] . --- .circleci/config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1a574c10c9..557a2fd4ab 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -48,7 +48,11 @@ commands: command: | brew --version brew untap Homebrew/homebrew-cask-versions + # Adopt JDK issue workaround, may no longer needed in future MacOS base images + brew uninstall adoptopenjdk11 brew untap adoptopenjdk/openjdk + # brew install openjdk + # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ brew update brew upgrade git brew install fish From cb2d9484cc19a96f6ca20faa2d422f71c9997ee0 Mon Sep 17 00:00:00 2001 From: Omry Yadan Date: Wed, 19 Jun 2024 13:52:56 +0800 Subject: [PATCH 8/8] . --- .circleci/config.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 557a2fd4ab..e975ad54a4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -48,11 +48,6 @@ commands: command: | brew --version brew untap Homebrew/homebrew-cask-versions - # Adopt JDK issue workaround, may no longer needed in future MacOS base images - brew uninstall adoptopenjdk11 - brew untap adoptopenjdk/openjdk - # brew install openjdk - # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ brew update brew upgrade git brew install fish