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

merging master #497

Merged
merged 49 commits into from
Jun 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
b4e2fd8
add more info on schema description
Remi-Gau Jul 26, 2020
de80928
add a how to create a protocol page
Remi-Gau Aug 23, 2020
b387613
splitting tutorial in several pages
Remi-Gau Aug 25, 2020
4a59c0e
update doc
Remi-Gau Aug 30, 2020
74310e6
[DOC] use demographics to show how to reuse items
Remi-Gau Aug 30, 2020
fa04451
fix demographics
Remi-Gau Aug 30, 2020
777e5a7
Merge branch 'master' into remi-documentation
Remi-Gau May 19, 2023
e975004
update doc
yibeichan Feb 14, 2024
60874e4
fix typo
yibeichan Feb 19, 2024
3e7b69c
Merge remote-tracking branch 'upstream/master' into remi-documentation
Remi-Gau Mar 20, 2024
4f0bc46
move files into a different section
Remi-Gau Mar 20, 2024
c859504
revert
Remi-Gau Mar 20, 2024
b435918
add syntax highlighting
Remi-Gau Mar 20, 2024
d51b369
fa044510e fix demographics
Remi-Gau Mar 20, 2024
3d785fb
add codespell, update hooks, run pre-commit
Remi-Gau Mar 20, 2024
e9cd177
add CI to run and update precommit
Remi-Gau Mar 20, 2024
00822ef
add link check
Remi-Gau Mar 20, 2024
2fe0d3b
fix
Remi-Gau Mar 20, 2024
82ee64c
add more hooks
Remi-Gau Mar 20, 2024
b4a77ac
Merge pull request #466 from Remi-Gau/codespell
yibeichan Apr 21, 2024
5bd2332
Bump actions/setup-python from 2 to 5
dependabot[bot] Apr 21, 2024
f561b38
Bump pre-commit/action from 3.0.0 to 3.0.1
dependabot[bot] Apr 21, 2024
120edfb
Bump peter-evans/create-pull-request from 5 to 6
dependabot[bot] Apr 21, 2024
5f0ffdc
fix dead links
yibeichan Apr 22, 2024
d45e53e
Apply suggestions from code review
Remi-Gau Apr 22, 2024
f1d4c2b
Merge pull request #476 from ReproNim/fix-dead-links
yibeichan Apr 22, 2024
5dfd50b
Merge remote-tracking branch 'upstream/master' into link_check
Remi-Gau Apr 22, 2024
5c8d4d5
Update mlc_config.json
Remi-Gau Apr 22, 2024
82815f1
Update mlc_config.json
Remi-Gau Apr 22, 2024
e6ff620
Update mlc_config.json
Remi-Gau Apr 22, 2024
208d5f8
Update mlc_config.json
Remi-Gau Apr 22, 2024
a3f320e
Merge pull request #467 from Remi-Gau/link_check
yibeichan Apr 23, 2024
2f1211f
Merge pull request #399 from Remi-Gau/remi-documentation
yibeichan May 10, 2024
4f79010
Update check_md_links.yml
Remi-Gau May 10, 2024
cbeca31
Merge pull request #479 from Remi-Gau/patch-1
yibeichan May 10, 2024
3c28ef8
[MAINT] ensures precommit is run on master
Remi-Gau May 10, 2024
bedf2ff
fix spelling
Remi-Gau May 10, 2024
aefbfca
Merge pull request #474 from ReproNim/dependabot/github_actions/pre-c…
yibeichan May 10, 2024
a7191b7
Merge pull request #475 from ReproNim/dependabot/github_actions/peter…
yibeichan May 10, 2024
e81d9aa
Merge pull request #472 from ReproNim/dependabot/github_actions/actio…
yibeichan May 10, 2024
ccae7ad
fix links
Remi-Gau May 10, 2024
09d47a7
failing DOI
Remi-Gau May 10, 2024
41d2eba
Merge pull request #481 from Remi-Gau/patch-2
yibeichan May 10, 2024
59f49f3
Bump actions/checkout from 1 to 4
dependabot[bot] May 10, 2024
1aedaa6
Merge pull request #473 from ReproNim/dependabot/github_actions/actio…
yibeichan May 10, 2024
6b2ee7f
[MAINT] replace zenodo.json with citation.cff
Remi-Gau May 11, 2024
589ba86
[MAINT] implement dark mode
Remi-Gau May 11, 2024
3a8aa0c
[FIX] misc minor fixes to the documentation (#482)
Remi-Gau May 12, 2024
5318a51
resolving conflicts
djarecka Jun 14, 2024
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 .codespellrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[codespell]
skip = env,venv,*.svg
ignore-words-list = HSI
builtin = clear,rare
9 changes: 9 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
# Documentation
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
version: 2
updates:
- package-ecosystem: github-actions
directory: /
schedule:
interval: monthly
28 changes: 28 additions & 0 deletions .github/workflows/check_md_links.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
---
name: Check Markdown links

# checking for any dead links in markdown files

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

on:
push:
branches:
- master
pull_request:
branches: ['*']

jobs:
markdown-link-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: gaurav-nelson/github-action-markdown-link-check@v1
with:
config-file: ./mlc_config.json
folder-path: ./docs/
use-verbose-mode: yes
max-depth: -1
file-path: ./README.md,
2 changes: 1 addition & 1 deletion .github/workflows/publishdocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout master
uses: actions/checkout@v1
uses: actions/checkout@v4

- name: Deploy docs
uses: mhausenblas/mkdocs-deploy-gh-pages@master
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pythonpackage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python 3.10
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: "3.10"
- name: Install dependencies
Expand Down
15 changes: 15 additions & 0 deletions .github/workflows/run_precommit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
name: pre-commit

on:
pull_request:
push:
branches: [master]

jobs:
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
- uses: pre-commit/[email protected]
53 changes: 53 additions & 0 deletions .github/workflows/update_precommit_hooks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
---
name: Update precommit hooks


on:

# Uses the cron schedule for github actions
#
# https://docs.github.com/en/free-pro-team@latest/actions/reference/events-that-trigger-workflows#scheduled-events
#
# ┌───────────── minute (0 - 59)
# │ ┌───────────── hour (0 - 23)
# │ │ ┌───────────── day of the month (1 - 31)
# │ │ │ ┌───────────── month (1 - 12 or JAN-DEC)
# │ │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
# │ │ │ │ │
# │ │ │ │ │
# │ │ │ │ │
# * * * * *
schedule:
- cron: 0 0 * 1,7 * # january and july

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
update_precommit_hooks:

# only run on upstream repo
if: github.repository_owner == 'SIMEXP'

runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.12'
allow-prereleases: false
- name: Install pre-commit
run: pip install pre-commit
- name: Update pre-commit hooks
run: pre-commit autoupdate
- name: Create Pull Request
uses: peter-evans/create-pull-request@v6
with:
commit-message: pre-commit hooks auto-update
base: main
token: ${{ secrets.GITHUB_TOKEN }}
delete-branch: true
title: '[BOT] update pre-commit hooks'
body: done via this [GitHub Action](https://github.com/${{ github.repository_owner }}/reproschema /blob/main/.github/workflows/update_precommit_hooks.yml)
22 changes: 22 additions & 0 deletions .github/workflows/validation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
name: validation

on:
pull_request:
push:
branches: [master]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:

validate_cff:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Check whether the citation metadata from CITATION.cff is valid
uses: citation-file-format/[email protected]
with:
args: --validate
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
.DS_Store
.idea/
activities/.DS_Store
protocols/.DS_Store

.idea/

node_modules
local_data

package-lock.json
package.json
11 changes: 9 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,20 @@
# See https://pre-commit.com/hooks.html for more hooks
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.0.0
rev: v4.5.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-yaml
- id: check-json
- id: check-ast
- id: check-added-large-files
- id: check-merge-conflict
- repo: https://github.com/psf/black
rev: 19.3b0
rev: 24.3.0
hooks:
- id: black
- repo: https://github.com/codespell-project/codespell
rev: v2.2.6
hooks:
- id: codespell
18 changes: 18 additions & 0 deletions .remarkrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"plugins": [
"preset-lint-markdown-style-guide",
"preset-lint-recommended",
"remark-gfm",
["lint-no-duplicate-headings", false],
["lint-list-item-indent", "tab-size"],
["lint-emphasis-marker", "consistent"],
["lint-maximum-line-length", 500],
["lint-maximum-heading-length", false],
["lint-no-shortcut-reference-link", false],
["remark-lint-unordered-list-marker-style", "-"],
["lint-no-trailing-spaces"],
["remark-lint-code-block-style", false],
["lint-no-undefined-references", false],
["remark-lint-heading-style", false]
]
}
16 changes: 0 additions & 16 deletions .zenodo.json

This file was deleted.

33 changes: 33 additions & 0 deletions CITATION.cff
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# schema: https://github.com/citation-file-format/citation-file-format/blob/main/schema-guide.md

cff-version: 1.2.0

title: reproschema

abstract: >-
A standardized form generation and data collection schema to harmonize results by design across projects.

version: 1.0.0-rc4

license: CC-BY-4.0

repository-code: https://github.com/ReproNim/reproschema.git

message: >-
To cite the reproschema, please follow the instructions here:
https://zenodo.org/doi/10.5281/zenodo.4064939

identifiers:
- description: PDFs of the BIDS specification for versions 1.9.0 and above
type: doi
value: 10.5281/zenodo.4064939

keywords:
- "schema"
- "assessment"
- "jsonld"
- "rdf"
- "repronim"

authors:
- family-names: Reproschema Contributors
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ following libraries via pip

To make a new release:

```
```bash
python scripts/makeRelease.py <version>
python scripts/editProperties.py <version>
```
Expand Down
76 changes: 0 additions & 76 deletions docs/20_project_structure.md

This file was deleted.

25 changes: 0 additions & 25 deletions docs/41_create_new_protocol.md

This file was deleted.

Loading
Loading