fix(tests): fix tests

* Reorganizes imports with the isort black profile.

Co-Authored-by: Johnny Mariéthoz <Johnny.Mariethoz@rero.ch>

Author: jma

docker-services.yml

@@ -15,7 +15,6 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-version: '2.3'
 services:
   app:
     build:
@@ -109,7 +108,7 @@ services:
     ports:
       - "5555:5555"
   grobid:
-    image: lfoppiano/grobid:0.8.0
+    image: lfoppiano/grobid:latest-crf
     ports:
       - "8070:8070"
       - "8071:8071"

pyproject.toml

@@ -268,6 +268,9 @@ appnope = { version = "*",optional = true }
 beautifulsoup4 = "^4.11.1"
 requests-mock = "^1.11.0"
 
+[tool.isort]
+profile = "black"
+
 [tool.pytest.ini_options]
 addopts = "--color=yes --isort --pydocstyle --exclude-warning-annotations --doctest-glob='*.rst' --doctest-modules --cov=sonar --cov-report=term-missing --ignore=setup.py --ignore=docs/conf.py -p celery.contrib.pytest"
 testpaths = ["docs", "tests", "sonar"]

sonar/__init__.py

@@ -21,4 +21,4 @@
 
 from .version import __version__
 
-__all__ = ('__version__', )
+__all__ = ("__version__",)

sonar/affiliations/__init__.py

@@ -21,4 +21,4 @@
 
 from .affiliation_resolver import AffiliationResolver
 
-__all__ = ('AffiliationResolver', )
+__all__ = ("AffiliationResolver",)

sonar/affiliations/affiliation_resolver.py

@@ -22,10 +22,10 @@
 from fuzzywuzzy import fuzz
 from werkzeug.utils import cached_property
 
-CSV_FILE = './data/affiliations.csv'
+CSV_FILE = "./data/affiliations.csv"
 
 
-class AffiliationResolver():
+class AffiliationResolver:
     """Affiliation resolver."""
 
     @cached_property
@@ -36,8 +36,8 @@ def affiliations(self):
         """
         affiliations = []
 
-        with open(CSV_FILE, 'r') as file:
-            reader = csv.reader(file, delimiter='\t')
+        with open(CSV_FILE, "r") as file:
+            reader = csv.reader(file, delimiter="\t")
             for row in reader:
                 affiliation = []
                 for index, value in enumerate(row):
@@ -64,21 +64,24 @@ def resolve(self, searched_affiliation):
             standard_form = affiliations[0]
             for affiliation in affiliations:
                 score = fuzz.partial_ratio(searched_affiliation, affiliation)
-                if (score > 92 and standard_form not in collected_affiliations):
+                if score > 92 and standard_form not in collected_affiliations:
                     # handle special case UZH / ZHdK
                     # TODO: solve this special case by converting the CSV file to JSON
                     # using rejected forms https://github.com/rero/sonar/issues/824
-                    if (affiliation.lower() == 'zurich university' and
-                            'zurich university of the arts' in searched_affiliation.lower()
+                    if (
+                        affiliation.lower() == "zurich university"
+                        and "zurich university of the arts"
+                        in searched_affiliation.lower()
                     ):
                         continue
                     # handle special case CERN/Lucerne
-                    if (affiliation.lower() == 'cern' and
-                        'lucerne' in searched_affiliation.lower()
+                    if (
+                        affiliation.lower() == "cern"
+                        and "lucerne" in searched_affiliation.lower()
                     ):
                         continue
                     # handle special case Freiburg im Breisgau
-                    if 'university of freiburg' in searched_affiliation.lower():
+                    if "university of freiburg" in searched_affiliation.lower():
                         break
 
                     collected_affiliations.append(standard_form)

sonar/celery.py

@@ -26,15 +26,17 @@
 # load .env and .flaskenv
 load_dotenv()
 
-celery = create_celery_app(create_ui(
-    SENTRY_TRANSPORT='raven.transport.http.HTTPTransport',
-    RATELIMIT_ENABLED=False,
-))
+celery = create_celery_app(
+    create_ui(
+        SENTRY_TRANSPORT="raven.transport.http.HTTPTransport",
+        RATELIMIT_ENABLED=False,
+    )
+)
 """Celery application for Invenio.
 Overrides SENTRY_TRANSPORT wih synchronous HTTP transport since Celery does not
 deal nicely with the default threaded transport.
 """
 
 # Trigger an app log message upon import. This makes Sentry logging
 # work with `get_task_logger(__name__)`.
-celery.flask_app.logger.info('Created Celery app')
+celery.flask_app.logger.info("Created Celery app")