Skip to content

Commit 40293c0

Browse files
pierreaubertpierreaubert
authored
Merge pull request #264 from pierreaubert/develop
Merge Develop into Master before switch to Rust
2 parents 804e214 + e64e37d commit 40293c0

File tree

1,352 files changed

+179848
-2217
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,352 files changed

+179848
-2217
lines changed

‎.eslintignore‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# /node_modules/* in the project root is ignored by default
2+
/node_modules/*
3+
4+
# build artefacts
5+
dist/*
6+
build/*
7+
coverage/*
8+
9+
# data definition files
10+
**/*.d.ts
11+
12+
# 3rd party libs
13+
/src/public/

‎.eslintrc.js‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
module.exports = {
2-
env: {
3-
browser: true,
4-
es2021: true
5-
},
6-
extends: 'eslint:recommended',
7-
parserOptions: {
8-
ecmaVersion: 12,
9-
sourceType: 'module'
10-
},
11-
rules: {
12-
}
13-
}
2+
env: {
3+
browser: true,
4+
es6: true,
5+
},
6+
extends: 'eslint:recommended',
7+
parserOptions: {
8+
ecmaVersion: 12,
9+
sourceType: 'module',
10+
},
11+
rules: {},
12+
};

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches: [ master debug ]
16+
branches: [ master develop]
1717
pull_request:
1818
# The branches below must be a subset of the branches above
19-
branches: [ master ]
19+
branches: [ develop ]
2020
schedule:
2121
- cron: '15 1 * * 4'
2222

‎.github/workflows/pythonapp.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313

1414
steps:
1515
- uses: actions/checkout@v2
16-
- name: Set up Python 3.10.6
16+
- name: Set up Python 3.10.12
1717
uses: actions/setup-python@v3
1818
with:
19-
python-version: "3.10.6"
19+
python-version: "3.10.12"
2020
- run: which python
2121
- run: pwd
2222
- run: ls -la

‎.gitignore‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
.ipynb_checkpoints
22
Untitled*.ipynb
33
snippets*.ipynb
4-
*~
5-
#*#
6-
.#*
7-
*.bak
4+
**/*~
5+
**/#*.*#
6+
**/.#*
7+
**/*.bak
8+
**/*.so
9+
**/*_large.png
810
__pycache__
911
.idea
1012
TAGS
1113
.coverage
1214
.idea
13-
*_large.png
1415
docs
1516
tmp
1617
extracted
@@ -40,12 +41,10 @@ cache.*.h5
4041
*.log
4142
*.csv
4243
*.out
43-
#generate_meta.py#
4444
.vscode
4545
.cache
4646
.sass-cache
4747
build
48-
*.so
4948
bin
5049
coverage.xml
5150
recompute_eqs.sh

‎.husky/pre-commit‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎.pre-commit-config.yaml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,21 @@ repos:
2424
rev: v1.0.5
2525
hooks:
2626
- id: csslint
27-
- repo: https://github.com/astral-sh/ruff-pre-commit
27+
- repo: https://github.com/pre-commit/mirrors-eslint
28+
rev: 'v8.53.0' # Use the sha / tag you want to point at
29+
hooks:
30+
- id: eslint
31+
additional_dependencies:
32+
- eslint@4.15.0
33+
- eslint-loader@1.6.1
34+
- eslint-plugin-react@6.10.3
35+
- babel-eslint@6.1.2
36+
- repo: https://github.com/pre-commit/mirrors-prettier
37+
rev: 'v3.0.3' # Use the sha / tag you want to point at
38+
hooks:
39+
- id: prettier
40+
types_or: [javascript]
41+
- repo: https://github.com/charliermarsh/ruff-pre-commit
2842
# Ruff version.
2943
rev: 'v0.1.8'
3044
hooks:

‎.prettierignore‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Ignore artifacts:
2+
build
3+
dist
4+
coverage
5+
docs
6+
7+
# Ignore all HTML files:
8+
*.html
9+
10+
.gitignore
11+
.prettierignore

‎ChangeLog‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
2023-11-12 pierre <pierre@spin.internet-box.ch>
2+
3+
* tests/test_go.py: tests are not passing for mysterious reasons
4+
5+
* src/website/nav_simple.html: add logo back on mobile
6+
7+
* src/website/assets/similar.js: add support for radar plot
8+
9+
2023-11-11 pierre <pierre@spin.internet-box.ch>
10+
11+
* src/website/assets/common.js: split title over 2 lines if too long
12+
; got the grid back
13+
14+
* src/website/speaker_desc.html: fix a v.s an for active / passive
15+
16+
* src/website/compare.html: fix levels ; fix call order when a
17+
change is done to a selector
18+
19+
* src/website/assets/compare.js: add title again; looks like
20+
pre-submit messed up
21+
22+
2023-11-10 pierre <pierre@spin.internet-box.ch>
23+
24+
* src/website/assets/compare.js: fix fieldset and make it disabled
25+
automatically if only one field is present

‎Dockerfile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,22 @@ WORKDIR /usr/src/spinorama
1313

1414
COPY . .
1515

16+
RUN [ -x /usr/bin/apt ] && /usr/bin/apt install -y python3 python3-pip imagemagick keychain npm wget python3.10-venv
17+
RUN [ -x /usr/bin/localedef ] && /usr/bin/localedef -f UTF-8 -i en_US en_US.UTF-8
1618
RUN /usr/bin/python3.10 -m venv .venv
1719
RUN . .venv/bin/activate
1820
RUN pip3 install -U -r ./requirements.txt && \
1921
pip3 install -U -r ./requirements-test.txt && \
2022
pip3 install -U -r ./requirements-dev.txt && \
2123
pip3 install -U -r ./requirements-api.txt
2224

23-
RUN npm install --production
25+
RUN npm install --production pyright w3c-html-validator standard flow flow-remove-types
2426

2527
# FROM ubuntu:22.04 AS final
2628

2729
ENV PYTHONPATH=/usr/src/spinorama/src:/usr/src/spinorama/src/website
2830

29-
CMD pytest tests
31+
RUN cd /usr/src/spinorama/src/spinorama && python setup.py build_ext --inplace && ln -s c_compute_scores.cpython-*.so c_compute_scores.so
32+
CMD cd /usr/src/spinorama && pytest tests
3033

3134
EXPOSE 443

0 commit comments

Comments
 (0)