Skip to content

Commit

Permalink
Merge branch 'main' into moduleddalog2
Browse files Browse the repository at this point in the history
  • Loading branch information
wolski committed Nov 23, 2023
2 parents e745c47 + 92c8d64 commit 579809e
Show file tree
Hide file tree
Showing 68 changed files with 7,742 additions and 326 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.7", "3.8", "3.9", "3.10"]
python-version: ["3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v3
Expand Down
25 changes: 25 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"[python]": {
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.organizeImports": true
},
"editor.rulers": [
88
],
"editor.defaultFormatter": "ms-python.black-formatter"
},
"python.formatting.provider": "none",
"python.testing.unittestArgs": [
"-v",
"-s",
"./test",
"-p",
"test_*.py"
],
"python.testing.pytestEnabled": false,
"python.testing.unittestEnabled": true,
"flake8.args": [
"--max-line-length=120",
],
}
1 change: 1 addition & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Code of conduct
4 changes: 3 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,10 @@ Using a virtual environment is recommended.

To run the tests run the command:

> We use pytest which also supports unittest if you prefer that.
```
python -m unittest test/test_module_dda_quant.py
pytest
```


Expand Down
1 change: 0 additions & 1 deletion Results_Module2_quant_DDA
Submodule Results_Module2_quant_DDA deleted from bcd177
19 changes: 19 additions & 0 deletions docs/_static/css/custom.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
@import url('https://fonts.googleapis.com/css2?family=Open+Sans&family=Roboto+Slab:wght@500&display=swap');

html {
--pst-font-family-base: 'Open Sans', sans-serif;
--pst-font-family-heading: 'Roboto Slab', serif;
--pst-font-weight-heading: 500;
}

/* html[data-theme="light"] {
--pst-color-primary: #3b5880;
}
html[data-theme="dark"] {
--pst-color-primary: #5c87c2;
}
a:visited {
color: var(--pst-color-link);
} */
150 changes: 150 additions & 0 deletions docs/_static/proteobench-logo-horizontal-inverted.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 579809e

Please sign in to comment.