Fix CI tests (facebookresearch#2921)

Co-authored-by: Omry Yadan <[email protected]>

.circleci/config.yml

@@ -39,8 +39,8 @@ commands:
             if [[ -f ~/miniconda3/LICENSE.txt ]] ; then
               echo "miniconda installed already."
             else
-              curl -o Miniconda3-py38_4.8.3-MacOSX-x86_64.sh https://repo.anaconda.com/miniconda/Miniconda3-py38_4.8.3-MacOSX-x86_64.sh
-              bash ./Miniconda3-py38_4.8.3-MacOSX-x86_64.sh -b
+              curl -o Miniconda3-py39_24.5.0-0-MacOSX-arm64.sh https://repo.anaconda.com/miniconda/Miniconda3-py39_24.5.0-0-MacOSX-arm64.sh
+              bash ./Miniconda3-py39_24.5.0-0-MacOSX-arm64.sh -b
             fi
             ~/miniconda3/bin/conda init bash
       - run:

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
 

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
 

plugins/hydra_ray_launcher/tests/test_ray_aws_launcher.py

@@ -11,7 +11,11 @@
 
 import boto3  # type: ignore
 import pkg_resources
-from botocore.exceptions import NoCredentialsError, NoRegionError  # type: ignore
+from botocore.exceptions import (  # type: ignore
+    ClientError,
+    NoCredentialsError,
+    NoRegionError,
+)
 from hydra.core.plugins import Plugins
 from hydra.plugins.launcher import Launcher
 from hydra.test_utils.launcher_common_tests import (
@@ -49,7 +53,7 @@
     ec2 = boto3.client("ec2")
     ec2.describe_regions()
     aws_not_configured = False
-except (NoCredentialsError, NoRegionError):
+except (ClientError, NoCredentialsError, NoRegionError):
     aws_not_configured = True
 
 
@@ -129,7 +133,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
 
@@ -139,7 +143,8 @@ def build_ray_launcher_wheel(tmp_wheel_dir: str) -> str:
     plugin = "hydra_ray_launcher"
     os.chdir(Path("plugins") / plugin)
     log.info(f"Build wheel for {plugin}, save wheel to {tmp_wheel_dir}.")
-    run_command(f"python setup.py sdist bdist_wheel && cp dist/*.whl {tmp_wheel_dir}")
+    run_command("python setup.py sdist bdist_wheel")
+    run_command(f"cp dist/*.whl {tmp_wheel_dir}")
     log.info("Download all plugin dependency wheels.")
     run_command(f"pip download . -d {tmp_wheel_dir}")
     plugin_wheel = run_command("ls dist/*.whl").split("/")[-1]
@@ -149,7 +154,8 @@ def build_ray_launcher_wheel(tmp_wheel_dir: str) -> str:
 
 def build_core_wheel(tmp_wheel_dir: str) -> str:
     chdir_hydra_root()
-    run_command(f"python setup.py sdist bdist_wheel && cp dist/*.whl {tmp_wheel_dir}")
+    run_command("python setup.py sdist bdist_wheel")
+    run_command(f"cp dist/*.whl {tmp_wheel_dir}")
 
     # download dependency wheel for hydra-core
     run_command(f"pip download -r requirements/requirements.txt -d {tmp_wheel_dir}")