Merge pull request #234 from pierreaubert/develop

Develop

Author: pierreaubert

.github/workflows/pythonapp.yml

@@ -17,21 +17,25 @@ jobs:
       uses: actions/setup-python@v3
       with:
         python-version: "3.10.6"
+    - run: which python
+    - run: pwd
+    - run: ls -la
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
+        sudo apt-get install -y build-essential
         pip install -r requirements.txt
-        pip install -r requirements-tests.txt
+        pip install -r requirements-test.txt
     - name: Lint with flake8
       run: |
         pip install flake8
-        # stop the build if there are Python syntax errors or undefined names
         flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics --exclude spinorama-venv
-        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        # flake8 . --count --exit-zero --max-complexity=13 --max-line-length=127 --statistics
     - name: Test metadata file
       run: |
         PYTHONPATH=src ./check_meta.py
+    - name: Compilation of cython files
+      run: |
+        PYTHONPATH=src cd src/spinorama && python setup.py build_ext --inplace && ln -s c_compute_scores.cpython-*.so c_compute_scores.so
     - name: Test with pytest
       run: |
         pip install pytest

.gitignore

@@ -22,6 +22,7 @@ asrbook.toc
 asrbook.log
 asrbook.pdf
 book/stats
+flycheck_*.*
 node_modules
 geckodriver.log
 package-lock.json
@@ -42,3 +43,5 @@ cache.*.h5
 .vscode
 .cache
 .sass-cache
+build
+*.so

.pylintrc

@@ -2,4 +2,4 @@
 
 # Format style used to check logging format string. `old` means using %
 # formatting, `new` is for `{}` formatting,and `fstr` is for f-strings.
-logging-format-style=new
+logging-format-style=old

book/generate_book.py

@@ -47,17 +47,16 @@
     # load all metadata from generated json file
     json_filename = "../docs/assets/metadata.json"
     if not os.path.exists(json_filename):
-        logging.fatal("Cannot find {0}".format(json_filename))
+        logging.fatal("Cannot find %s", json_filename)
         sys.exit(1)
 
     meta = None
     with open(json_filename, "r") as f:
         meta = json.load(f)
 
     def sort_meta(s):
-        if "pref_rating" in s.keys():
-            if "pref_score" in s["pref_rating"].keys():
-                return s["pref_rating"]["pref_score"]
+        if "pref_rating" in s and "pref_score" in s["pref_rating"]:
+            return s["pref_rating"]["pref_score"]
         return -1
 
     keys_sorted = sorted(meta, key=lambda a: sort_meta(meta[a]), reverse=True)
@@ -77,7 +76,7 @@ def sort_meta(s):
     # write index.html
     for template in ("asrbook",):
         name = "{0}.tex".format(template)
-        logging.info("Write {0} ({1} speakers found".format(name, len(speakers.keys())))
+        logging.info("Write %s (%d speakers found", name, len(speakers.keys()))
         template_tex = mako_templates.get_template(name)
 
         with open("tmp/{0}".format(name), "w") as f:

check_html.sh

@@ -24,11 +24,11 @@ for d in docs/*.html; do
         status=1;
         echo "$d is empty (ERROR)";
     else
-        msg=$(./node_modules/.bin/html-validator --format=html --file="$d");
+        msg=$(./node_modules/.bin/w3c-html-validator --quiet "$d");
         if test -n "$msg"; then
             status=1;
             echo "Linting $d (ERROR)";
-    	    ./node_modules/.bin/html-validator --format=html --file="$d" --verbose;
+    	    ./node_modules/.bin/w3c-html-validator "$d";
         fi
     fi
 done