Skip to content

Commit

Permalink
Merge pull request #394 from CSCfi/develop
Browse files Browse the repository at this point in the history
release v0.13.0
  • Loading branch information
genie9 authored Apr 7, 2022
2 parents 62f6747 + 32f32ee commit ce026c3
Show file tree
Hide file tree
Showing 122 changed files with 11,728 additions and 3,554 deletions.
39 changes: 39 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"name": "Existing Docker Compose (Extend)",
"initializeCommand": "docker buildx install",
"dockerComposeFile": [
"../docker-compose.yml",
"docker-compose.extend.yml"
],
"service": "backend",
"workspaceFolder": "/workspace",
"settings": {
"editor.formatOnSave": true,
"git.inputValidation": "always",
"files.insertFinalNewline": true,
"[python]": {
"editor.codeActionsOnSave": {
"source.organizeImports": true
}
},
"python.formatting.provider": "black",
"python.formatting.blackArgs": ["--line-length", "120"],
"python.languageServer": "Pylance",
"python.linting.flake8Enabled": true,
"python.linting.pylintEnabled": true,
"python.linting.enabled": true,
"python.pythonPath": "/usr/local/bin/python",
"python.linting.mypyEnabled": true,
"python.linting.mypyArgs": [
"--ignore-missing-imports",
"--follow-imports=silent",
"--show-column-numbers",
"--strict",
"--exclude tests"
],
},
"extensions": [
"ms-python.python",
"ms-python.vscode-pylance",
],
}
9 changes: 9 additions & 0 deletions .devcontainer/docker-compose.extend.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
version: '3'
services:
backend:
build:
context: .
target: local
volumes:
- .:/workspace:cached
command: /bin/sh -c "while sleep 1000; do :; done"
39 changes: 39 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# authentication
AAI_CLIENT_SECRET=secret_must_be_long
AAI_CLIENT_ID=aud2
OIDC_URL=http://mockauth:8000
# change to http://mockauth:8000 if tests are run from container
OIDC_URL_TEST=http://localhost:8000


# app urls
BASE_URL=http://localhost:5430
# change to http://frontend:3000 if started using docker-compose for frontend
# should be commented out when running integration tests
# REDIRECT_URL=http://localhost:3000

# logging
LOG_LEVEL=DEBUG

# database
MONGO_HOST=database:27017
MONGO_DATABASE=default
MONGO_AUTHDB=admin
MONGO_INITDB_ROOT_PASSWORD=admin
MONGO_INITDB_ROOT_USERNAME=admin
MONGO_SSL=true
MONGO_SSL_CA=/tls/cacert
MONGO_SSL_CLIENT_KEY=/tls/key
MONGO_SSL_CLIENT_CERT=/tls/cert

# doi
DOI_API=http://mockdoi:8001/dois
DOI_PREFIX=10.xxxx
DOI_USER=user
DOI_KEY=key
DISCOVERY_URL=https://etsin.demo.fairdata.fi/dataset/

# metax
METAX_USER=sd
METAX_PASS=demo_pass
METAX_URL=http://mockmetax:8002
49 changes: 49 additions & 0 deletions .github/config/.spellcheck.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
matrix:
- name: Markdown
aspell:
lang: en
ignore-case: true
dictionary:
wordlists:
- .github/config/.wordlist.txt
encoding: utf-8
pipeline:
- pyspelling.filters.markdown:
- pyspelling.filters.context:
context_visible_first: true
escapes: '\\[\\`~]'
delimiters:
# Ignore text between inline back ticks as this is code or hightlight words
- open: '(?P<open>`+)'
close: '(?P=open)'
# Ignore surrounded in <> as in RST it is link
- open: '<(https?://[^\\s/$.?#].[^\\s]+|[A-Za-z0-9-_:.]+)'
close: '>'
sources:
- 'docs/*.rst'
- '**/*.md'
default_encoding: utf-8

- name: JSON schemas
aspell:
lang: en
ignore-case: true
dictionary:
wordlists:
- .github/config/.wordlist.txt
pipeline:
- pyspelling.filters.javascript:
jsdocs: true
line_comments: false
block_comments: false
strings: true
- pyspelling.filters.context:
context_visible_first: true
escapes: '\\[\\`~]'
delimiters:
# Ignore Pāli word as it cannot be added to dictionary
- open: '(Pāli)'
close: '-'
sources:
- metadata_backend/helpers/schemas/*.json
default_encoding: utf-8
Loading

0 comments on commit ce026c3

Please sign in to comment.