Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

📝 Maintenance: cleanup readme and vscode settings #5023

Merged
merged 7 commits into from
Nov 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@
"charliermarsh.ruff",
"eamodio.gitlens",
"exiasr.hadolint",
"ms-azuretools.vscode-docker",
"ms-python.black-formatter",
pcrespov marked this conversation as resolved.
Show resolved Hide resolved
"ms-python.pylint",
"ms-python.python",
"njpwerner.autodocstring",
"samuelcolvin.jinjahtml",
"timonwong.shellcheck",
"vscode-icons-team.vscode-icons",
pcrespov marked this conversation as resolved.
Show resolved Hide resolved
]
}
26 changes: 8 additions & 18 deletions .vscode/settings.template.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// This is a template. Clone and replace extension ".template.json" by ".json"
{
"autoDocstring.docstringFormat": "pep257",

"editor.tabSize": 2,
"editor.insertSpaces": true,
"editor.detectIndentation": false,
Expand Down Expand Up @@ -27,9 +29,8 @@
"**/.git/subtree-cache/**": true,
"**/node_modules/*/**": true
},
"python.formatting.autopep8Args": [
"--max-line-length 140"
],
"python.analysis.autoImportCompletions": true,
"python.analysis.typeCheckingMode": "basic",
"python.analysis.extraPaths": [
"./packages/models-library/src",
"./packages/postgres-database/src",
Expand All @@ -54,26 +55,15 @@
"[makefile]": {
"editor.insertSpaces": false
},
"python.testing.pytestEnabled": true,
pcrespov marked this conversation as resolved.
Show resolved Hide resolved
"autoDocstring.docstringFormat": "pep257",
"hadolint.hadolintPath": "${workspaceFolder}/scripts/hadolint.bash",
"hadolint.cliOptions": [],
"shellcheck.executablePath": "${workspaceFolder}/scripts/shellcheck.bash",
"shellcheck.run": "onSave",
"shellcheck.enableQuickFix": true,
"python.formatting.provider": "black",
"isort.path": [
"${workspaceFolder}/.venv/bin/isort"
],
"isort.args": [
"--settings-path=${workspaceFolder}/.isort.cfg"
],
"python.analysis.autoImportCompletions": true,
"python.analysis.typeCheckingMode": "basic",
"ruff.lint.args": [
pcrespov marked this conversation as resolved.
Show resolved Hide resolved
"--config=${workspaceFolder}/.ruff.toml"
],
"ruff.path": [
"${workspaceFolder}/.venv/bin/ruff"
]
],
"shellcheck.executablePath": "${workspaceFolder}/scripts/shellcheck.bash",
"shellcheck.run": "onSave",
"shellcheck.enableQuickFix": true
}
12 changes: 4 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<img src="https://user-images.githubusercontent.com/32800795/61083844-ff48fb00-a42c-11e9-8e63-fa2d709c8baf.png" width="500">
</p>


<!-- BADGES: LINKS ON CLICK --------------------------------------------------------------->
[![black_badge]](https://github.com/psf/black)
[![ci_badge]](https://github.com/ITISFoundation/osparc-simcore/actions/workflows/ci-testing-deploy.yml)
Expand All @@ -28,7 +27,6 @@
[osparc_status]:https://img.shields.io/badge/dynamic/json?label=osparc.io&query=%24.status.description&url=https%3A%2F%2Fstatus.osparc.io%2Fapi%2Fv2%2Fstatus.json
<!------------------------------------------------------------------------------------------>


The SIM-CORE, named **o<sup>2</sup>S<sup>2</sup>PARC** – **O**pen **O**nline **S**imulations for **S**timulating **P**eripheral **A**ctivity to **R**elieve **C**onditions – is one of the three integrative cores of the SPARC program’s Data Resource Center (DRC).
The aim of o<sup>2</sup>S<sup>2</sup>PARC is to establish a comprehensive, freely accessible, intuitive, and interactive online platform for simulating peripheral nerve system neuromodulation/ stimulation and its impact on organ physiology in a precise and predictive manner.
To achieve this, the platform will comprise both state-of-the art and highly detailed animal and human anatomical models with realistic tissue property distributions that make it possible to perform simulations ranging from the molecular scale up to the complexity of the human body.
Expand Down Expand Up @@ -72,15 +70,14 @@ Services are deployed in two stacks:``simcore-stack`` comprises all core-service
To build and run:

- git
- docker
- [docker](https://docs.docker.com/engine/install/ubuntu/#installation-methods)
- make >=4.2
- awk, jq (optional tools within makefiles)

To develop, in addition:

- python 3.10
- nodejs for client part (this dependency will be deprecated soon)
- swagger-cli (make sure to have a recent version of nodejs)
- *python 3.10*: we recommend using the python manager [pyenv](https://brain2life.hashnode.dev/how-to-install-pyenv-python-version-manager-on-ubuntu-2004)
- *nodejs* for client part: we recommend using the node manager [nvm](https://github.com/nvm-sh/nvm#install--update-script)
- [vscode] (highly recommended)

To verify current base OS, Docker and Python build versions have a look at:
Expand Down Expand Up @@ -135,7 +132,7 @@ To upgrade a single requirement named `fastapi`run:

- [Git release workflow](docs/releasing-workflow-instructions.md)
- Public [releases](https://github.com/ITISFoundation/osparc-simcore/releases)
- Production in https://osparc.io
- Production in <https://osparc.io>
- [Staging instructions](docs/releasing-workflow-instructions.md#staging-example)
- [User Manual](https://itisfoundation.github.io/osparc-manual/)

Expand Down Expand Up @@ -191,6 +188,5 @@ This project is licensed under the terms of the [MIT license](LICENSE).
</p>

<!-- ADD REFERENCES BELOW AND KEEP THEM IN ALPHABETICAL ORDER -->
[chocolatey]:https://chocolatey.org/
[vscode]:https://code.visualstudio.com/
[WSL2]:https://docs.microsoft.com/en-us/windows/wsl