Skip to content

Commit 51e6888

Browse files
authored
Merge pull request #241 (New React front end)
2 parents e2aaadc + b63ecd8 commit 51e6888

File tree

582 files changed

+22310
-11445
lines changed

Some content is hidden

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

582 files changed

+22310
-11445
lines changed

.coveragerc

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

.eslintrc.js

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
module.exports = {
2+
'root': true,
3+
'globals': {
4+
'gettext': true,
5+
'ngettext': true,
6+
'interpolate': true,
7+
'process': true,
8+
'require': true
9+
},
10+
'env': {
11+
'browser': true,
12+
'es2021': true,
13+
'node': true
14+
},
15+
'extends': [
16+
'eslint:recommended',
17+
'plugin:react/recommended'
18+
],
19+
'overrides': [],
20+
'parserOptions': {
21+
'ecmaVersion': 'latest',
22+
'sourceType': 'module'
23+
},
24+
'plugins': [
25+
'react'
26+
],
27+
'ignorePatterns': ['**/static/**/*.js'],
28+
'rules': {
29+
'indent': 'off',
30+
'no-empty-pattern': 'off',
31+
'linebreak-style': [
32+
'error',
33+
'unix'
34+
],
35+
'quotes': [
36+
'error',
37+
'single'
38+
],
39+
'semi': [
40+
'error',
41+
'never'
42+
]
43+
},
44+
'settings': {
45+
'react': {
46+
'version': 'detect'
47+
}
48+
}
49+
}

.github/workflows/pytest.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
matrix:
1010
db-backend: [mysql, postgres]
11-
python-version: ['3.9', '3.11']
11+
python-version: ['3.9', '3.12']
1212

1313
services:
1414
postgres:
@@ -34,10 +34,7 @@ jobs:
3434
3535
- name: Install Daiquiri
3636
run: |
37-
pip install -e .
38-
pip install psycopg2-binary
39-
pip install mysqlclient
40-
pip install coveralls
37+
pip install -e .[ci]
4138
4239
- name: Prepare testing app
4340
run: |
@@ -47,13 +44,11 @@ jobs:
4744
- name: Prepare MySQL database
4845
run: |
4946
sudo systemctl start mysql.service
50-
mysql --user=root --password=root < testing/sql/mysql/test.sql
51-
cat ../daiquiri/testing/sql/mysql/data/* | mysql --user=root --password=root
47+
mysql --user=root --password=root < testing/sql/mysql/setup.sql
5248
5349
- name: Prepare PostgreSQL database
5450
run: |
55-
psql postgresql://postgres:postgres_password@localhost:5432 -f testing/sql/postgres/test.sql
56-
cat ../daiquiri/testing/sql/postgres/data/* | psql postgresql://postgres:postgres_password@localhost:5432/test_daiquiri_data
51+
psql postgresql://postgres:postgres_password@localhost:5432 -f testing/sql/postgres/setup.sql
5752
psql postgresql://postgres:postgres_password@localhost:5432/test_daiquiri_data -c 'VACUUM ANALYSE;'
5853
5954
- name: Run tests

.gitignore

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@ __pycache__/
66
*.swp
77
.DS_Store
88

9+
# sometimes gcc dumps core when build fails
10+
/core
11+
12+
/daiquiri/auth/static/
13+
/daiquiri/contact/static/
14+
/daiquiri/core/static/
15+
/daiquiri/metadata/static/
16+
/daiquiri/query/static/
17+
/daiquiri/serve/static/
18+
919
/testing/config/settings/local.py
1020
/testing/download
1121
/testing/upload
@@ -16,10 +26,13 @@ __pycache__/
1626
/htmlcov
1727
/env
1828
/venv
29+
/node_modules
1930

2031
build
2132
dist
2233
*.egg-info
2334

35+
Makefile
36+
2437
.imdone/
2538
.on-save.json

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v21

.pre-commit-config.yaml

Lines changed: 36 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,37 @@
1+
# do not touch the migration files at all: these are auto-generated by Django
2+
exclude: \/migrations\/
3+
14
repos:
2-
- repo: https://github.com/pycqa/isort
3-
rev: '5.10.1'
4-
hooks:
5-
- id: isort
6-
- repo: https://github.com/pre-commit/mirrors-autopep8
7-
rev: 'v1.6.0'
8-
hooks:
9-
- id: autopep8
10-
- repo: https://github.com/pycqa/flake8
11-
rev: '3.9.2'
12-
hooks:
13-
- id: flake8
14-
exclude: ^.*/migrations/.*$
5+
- repo: meta
6+
hooks:
7+
- id: check-hooks-apply
8+
- repo: https://github.com/pre-commit/pre-commit-hooks
9+
rev: v4.6.0
10+
hooks:
11+
- id: check-ast
12+
- id: check-json
13+
- id: check-xml
14+
- id: check-yaml
15+
- id: end-of-file-fixer
16+
exclude: \.html$|\.txt$
17+
- id: trailing-whitespace
18+
- id: debug-statements
19+
- repo: https://github.com/astral-sh/ruff-pre-commit
20+
rev: v0.5.7
21+
hooks:
22+
- id: ruff
23+
args: [--fix, --exit-non-zero-on-fix]
24+
- repo: https://github.com/pre-commit/mirrors-eslint
25+
rev: v8.56.0
26+
hooks:
27+
- id: eslint
28+
args: [--fix, --color]
29+
additional_dependencies:
30+
- eslint@8.56.0
31+
- eslint-plugin-react@7.34.0
32+
- react@18.3.1
33+
- repo: https://github.com/crate-ci/typos
34+
rev: v1.23.6
35+
hooks:
36+
- id: typos
37+
exclude: daiquiri/metadata/settings.py

.ruff.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[format]
2+
# Like Black, use double quotes for strings.
3+
quote-style = "single"

AUTHORS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ The core developers are:
77
Yori Fournier <y.fournier@aip.de>
88
Kirill Makan <kmakan@aip.de>
99

10-
We apreciate contributions from:
10+
We appreciate contributions from:
1111

1212
Fernando Campos
1313
Harry Enke

CONTRIBUTING.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,5 @@ If you are a maintainer and you want to review a Pull-Request please follow the
1818
* Fetch the PR in your local-repository with: `git fetch origin pull/<PR-ID>/head:pr/<PR-ID> && git checkout pr/<PR-ID>`
1919
* Perform the unit-tests of daiquiri
2020
* Perform the instance-tests on the test-instance (dq-dev + test-app)
21-
* Perform the instance-tests on the conserned services (dq-dev + service-app)
21+
* Perform the instance-tests on the concerned services (dq-dev + service-app)
2222
* Report any failure to the author of the pull-request
23-

LICENSE

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,4 +200,3 @@
200200
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201201
See the License for the specific language governing permissions and
202202
limitations under the License.
203-

0 commit comments

Comments
 (0)