fix

mypy.ini

@@ -3,11 +3,8 @@
 [mypy-scipy.*,requests,pandas,compiler_gym,compiler_gym.*,gym_anm,matplotlib.*,pytest,cma,bayes_opt.*,torchvision.models,torch.*,mpl_toolkits.*,fcmaes.*,tqdm,pillow,PIL,PIL.Image,sklearn.*,pyomo.*,pyproj,IOHexperimenter.*,tensorflow,koncept.models,cv2,imquality,imquality.brisque,lpips,mixsimulator.*,networkx.*,cdt.*,pymoo,pymoo.*,bayes_optim.*,olympus.*,pymoo,pymoo.*,pybullet,pybullet_envs,pybulletgym,pyvirtualdisplay,nlopt,aquacrop.*]
 ignore_missing_imports = True
 
-<<<<<<< HEAD
 [mypy-nevergrad.functions.rl.agents,torchvision,torchvision.*,nevergrad.functions.games.*,nevergrad.functions.multiobjective.pyhv,nevergrad.optimization.test_doc,,pymoo,pymoo.*,pybullet,pybullet_envs,pybulletgym,pyvirtualdisplay,nlopt,pcse.*,yaml.*,aquacrop.*]
-=======
-[mypy-nevergrad.functions.rl.*,torchvision,torchvision.*,nevergrad.functions.games.*,nevergrad.functions.multiobjective.pyhv,nevergrad.optimization.test_doc,nevergrad.functions.gym.multigym,nevergrad.functions.gym.tuple_gym_env]
->>>>>>> 35edb978b33c666e12796682bfdb1fff26c1d3f5
+#[mypy-nevergrad.functions.rl.*,torchvision,torchvision.*,nevergrad.functions.games.*,nevergrad.functions.multiobjective.pyhv,nevergrad.optimization.test_doc,nevergrad.functions.gym.multigym,nevergrad.functions.gym.tuple_gym_env]
 ignore_missing_imports = True
 ignore_errors = True
 

nevergrad/functions/gym/test_multigym.py

@@ -56,14 +56,9 @@ def test_sparse_cartpole() -> None:
     assert min(results) != max(results), "CartPole should not be deterministic."
 
 
-<<<<<<< HEAD
-def test_default_run_multigym() -> None:
-    if os.name == "nt":
-=======
 @pytest.mark.parametrize("name", ["LunarLander-v2"])  # type: ignore
 def test_run_multigym(name: str) -> None:
     if os.name == "nt" or np.random.randint(8) or "CubeCrash" in name:
->>>>>>> 35edb978b33c666e12796682bfdb1fff26c1d3f5
         raise SkipTest("Skipping Windows and running only 1 out of 8")
     if "ANM" in name:
         raise SkipTest("We skip ANM6Easy and related problems.")

nevergrad/optimization/test_optimizerlib.py

@@ -728,17 +728,9 @@ def test_ngopt_selection(
                 # assert choice == "MetaTuneRecentering"
                 assert "MetaTuneRecentering" in optim_string
             if num_workers > 1:
-<<<<<<< HEAD
                 # assert choice not in ["SQP", "Cobyla"]
                 assert "SQP" not in optim_string and "Cobyla" not in optim_string
         assert opt._info()["sub-optim"] in optim_string
-=======
-                assert choice not in ["SQP", "Cobyla"]
-        if "CMA" not in choice:
-            assert choice == opt._info()["sub-optim"]
-        else:
-            assert choice in opt._info()["sub-optim"]
->>>>>>> 35edb978b33c666e12796682bfdb1fff26c1d3f5
 
 
 def test_bo_ordering() -> None: