MTN adapt code to refactored benchopt 1.1 (#6)

.github/workflows/main.yml

@@ -25,12 +25,14 @@ jobs:
         python-version: 3.8
 
     - name: Install dependencies
+      env:
+        BENCH_BRANCH: master
       run: |
         eval "$(conda shell.bash hook)"
         conda activate base
         # make sure we have the latest version of pip to correctly install benchopt in sub conda env
         pip install --upgrade pip
-        pip install -U https://api.github.com/repos/benchopt/benchOpt/zipball/master
+        pip install -U git+https://github.com/benchopt/benchopt@$BENCH_BRANCH
 
     - name: Test
       env:

.gitignore

@@ -1,5 +1,6 @@
 # Cache directories
 joblib
+__cache__
 .pytest_cache
 __pycache__
 *.egg-info

datasets/simulated.py

@@ -1,6 +1,6 @@
 import numpy as np
 
-from benchopt.base import BaseDataset
+from benchopt import BaseDataset
 
 
 class Dataset(BaseDataset):

objective.py

@@ -1,7 +1,7 @@
 import numpy as np
 
 
-from benchopt.base import BaseObjective
+from benchopt import BaseObjective
 
 
 class Objective(BaseObjective):

solvers/lightning.py

@@ -1,5 +1,5 @@
-from benchopt.base import BaseSolver
-from benchopt.util import safe_import_context
+from benchopt import BaseSolver
+from benchopt import safe_import_context
 
 
 with safe_import_context() as import_ctx:

solvers/sklearn.py

@@ -1,8 +1,8 @@
 import warnings
 
 
-from benchopt.base import BaseSolver
-from benchopt.util import safe_import_context
+from benchopt import BaseSolver
+from benchopt import safe_import_context
 
 
 with safe_import_context() as import_ctx: