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

WIP #2

Draft
wants to merge 44 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
96214fd
Fix command options
vferat May 15, 2023
7b13208
Remove output_dir argument from readme
vferat May 15, 2023
48c81b6
Add git+ instal lrequirements.txt
vferat May 15, 2023
59eb84b
Fix #69
vferat May 15, 2023
d00aa5e
Add logger
vferat May 15, 2023
6eea9ac
Change print to log and exception to valuerror
vferat May 15, 2023
f23c20a
Change value error on missing T2 images to warning
vferat May 15, 2023
1cbebf3
Update run_deeid.py
vferat May 15, 2023
05a1bf3
update docker recipe
Remi-Gau May 22, 2023
b44a56a
failure to initialize conda
Remi-Gau May 22, 2023
e025d41
Fix logger
vferat May 25, 2023
39f49c4
Merge remote-tracking branch 'remi/update_docker' into dev-fix
vferat Jun 5, 2023
9aaa522
wip
vferat Jun 9, 2023
ea7e0bc
Fix Dockerfile WIP
vferat Jun 13, 2023
93a75bd
Fix generate_images.sh
vferat Jun 19, 2023
bdcfd7e
Fix nobrainer weights path
vferat Jun 19, 2023
0580a3b
Fix issue if no t1w or t2w
vferat Jun 19, 2023
8e1413a
Fix tf_cpu dependency
vferat Jun 19, 2023
fe88f04
Fix deepdefacer requirements
vferat Jun 19, 2023
465ab7d
Remove --env NIPYPE_NO_ET=1 \
vferat Jun 19, 2023
2844700
--env NIPYPE_NO_ET=1 \
vferat Jun 19, 2023
67ebdbb
Update run_deeid.py
vferat Jun 19, 2023
275af64
wip
vferat Jun 26, 2023
0325d15
wip
vferat Jun 26, 2023
5d8618f
wip
vferat Jun 30, 2023
170bf05
wip
vferat Jun 30, 2023
e09cc27
wip
vferat Jun 30, 2023
e456380
Update run_deeid.py
vferat Jun 30, 2023
5410c53
wip
vferat Jul 3, 2023
9da82c5
Merge branch 'dev-clean' of https://github.com/fcbg-md/BIDSonym into …
vferat Jul 3, 2023
145c033
wip
vferat Jul 3, 2023
0be3411
wip
vferat Jul 3, 2023
fc40292
wip
vferat Jul 3, 2023
1b6bb73
wip
vferat Jul 4, 2023
5768420
Update test.yml
vferat Jul 4, 2023
9f29b1a
Update build.yml
vferat Jul 4, 2023
d87a716
Update test.yml
vferat Jul 5, 2023
0c38be9
Update test.yml
vferat Jul 10, 2023
2a14fda
Merge branch 'dev-clean' of https://github.com/fcbg-md/BIDSonym into …
vferat Jul 10, 2023
c77ab76
Create docker.yml
vferat Jul 10, 2023
82585b0
Update docker.yml
vferat Jul 10, 2023
9a8c868
Update docker.yml
vferat Jul 10, 2023
becab54
Fix docker action
pgossa Jul 18, 2023
a7f57b4
Fix tests
vferat Jul 24, 2023
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
10 changes: 0 additions & 10 deletions .codecov.yml

This file was deleted.

13 changes: 0 additions & 13 deletions .coveragerc

This file was deleted.

25 changes: 24 additions & 1 deletion .flake8
Original file line number Diff line number Diff line change
@@ -1,2 +1,25 @@
[flake8]
exclude = .git,__pycache__,build,dist,versioneer.py,bidsonym/_version.py,docs/source/conf.py
max-line-length = 79

ignore =
# these rules don't play well with black
# whitespace before ':'
E203,
# line break before binary operator
W503,
E241,E305,W504,W605,E731

exclude =
.git,
.github,
.pytest_cache,
pycrostates.egg-info,
setup.py,
docs/source/conf.py,
versioneer.py,
_version.py

per-file-ignores =
# __init__.py files are allowed to have unused imports and lines-too-long
*/__init__.py:F401
*/**/__init__.py:F401,E501
60 changes: 60 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: build
# https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#concurrency
# https://docs.github.com/en/developers/webhooks-and-events/events/github-event-types#pullrequestevent
# workflow name, PR number (empty on push), push ref (empty on PR)
concurrency:
group: ${{ github.workflow }}-${{ github.event.number }}-${{ github.event.ref }}
cancel-in-progress: true
on:
pull_request:
push:
branches: [main, master]
workflow_dispatch:

jobs:
build:
timeout-minutes: 30
strategy:
fail-fast: false
matrix:
os: [ubuntu]
python-version: [3.8, 3.9, "3.10", "3.11"]
name: ${{ matrix.os }} - ${{ matrix.python-version }}
runs-on: ${{ matrix.os }}-latest
defaults:
run:
shell: bash

env:
SKLEARN_ALLOW_DEPRECATED_SKLEARN_PACKAGE_INSTALL : "True"

steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: Setup Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
architecture: 'x64'
- name: Install dependencies
run: |
python -m pip install --progress-bar off --upgrade pip setuptools wheel
python -m pip install --progress-bar off .[build]
- name: Test package install
run: python -c "import bidsonym; print(bidsonym.__version__)"
- name: Remove package install
run: python -m pip uninstall -y bidsonym
- name: Build package
run: python -m build
- name: Install sdist
run: pip install ./dist/*.tar.gz
- name: Test sdist install
run: python -c "import bidsonym; print(bidsonym.__version__)"
- name: Remove sdist install
run: python -m pip uninstall -y bidsonym
- name: Install wheel
run: pip install ./dist/*.whl
- name: Test wheel install
run: python -c "import bidsonym; print(bidsonym.__version__)"
- name: Remove wheel install
run: python -m pip uninstall -y bidsonym
49 changes: 49 additions & 0 deletions .github/workflows/code-style.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: style
# https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#concurrency
# https://docs.github.com/en/developers/webhooks-and-events/events/github-event-types#pullrequestevent
# workflow name, PR number (empty on push), push ref (empty on PR)
concurrency:
group: ${{ github.workflow }}-${{ github.event.number }}-${{ github.event.ref }}
cancel-in-progress: true
on:
pull_request:
push:
branches: [main, master]
workflow_dispatch:

jobs:
style:
timeout-minutes: 10
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: Setup Python 3.9
uses: actions/setup-python@v4
with:
python-version: '3.9'
architecture: 'x64'
- name: Install dependencies
run: |
python -m pip install --progress-bar off --upgrade pip setuptools wheel
python -m pip install --progress-bar off .[style]
- name: Run flake8
uses: py-actions/flake8@v2
with:
path: "bidsonym"
- name: Run isort
uses: isort/isort-action@master
- name: Run black
uses: psf/black@stable
with:
options: "--check --verbose"
- name: Run codespell
uses: codespell-project/actions-codespell@master
with:
check_filenames: true
check_hidden: true
skip: ./.git,./build,./.github,*.bib
- name: Run pydocstyle
run: pydocstyle .
- name: Run bibclean
run: bibclean-check docs/references.bib
52 changes: 52 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: Docker
# https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#concurrency
# https://docs.github.com/en/developers/webhooks-and-events/events/github-event-types#pullrequestevent
# workflow name, PR number (empty on push), push ref (empty on PR)
concurrency:
group: ${{ github.workflow }}-${{ github.event.number }}-${{ github.event.ref }}
cancel-in-progress: true
on:
pull_request:
push:
branches: [main, master]
workflow_dispatch:

jobs:
test:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Make script executable
run: chmod +x ./generate_images.sh

- name: Generate docker file
run: ./generate_images.sh

- name: Log in to Docker Hub
uses: docker/[email protected]
with:
username: gitopsfcbg
password: ${{ secrets.CAMPUSBIOTECH_PROD_FLUXCD_DOCKERHUB }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/[email protected]
with:
images: docker.io/fcbg/${{ github.event.repository.name }}

- name: Build and push Docker image
uses: docker/[email protected]
with:
context: .
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

- name: Upload Dockerfile
uses: actions/upload-artifact@v3
with:
name: dockerfile
path: Dockerfile
42 changes: 42 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: test
# https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#concurrency
# https://docs.github.com/en/developers/webhooks-and-events/events/github-event-types#pullrequestevent
# workflow name, PR number (empty on push), push ref (empty on PR)
concurrency:
group: ${{ github.workflow }}-${{ github.event.number }}-${{ github.event.ref }}
cancel-in-progress: true
on:
pull_request:
push:
branches: [main, master]
workflow_dispatch:

jobs:
test:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Make script executable
run: chmod +x ./generate_images.sh

- name: Generate docker file
run: ./generate_images.sh

- name: Build Docker image
run: docker build -t bidsonym_tests .

- name: Setup Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: 3.9
architecture: 'x64'
- name: Install test dependencies
run: |
python -m pip install --progress-bar off --upgrade pip setuptools wheel
python -m pip install --progress-bar off docker pytest
python -m pip install --progress-bar off .[build]
- name: Test
run: pytest bidsonym
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.DS_Store

# Created by .ignore support plugin (hsz.mobi)

# pycharm project settings
Expand Down
30 changes: 0 additions & 30 deletions .travis.yml

This file was deleted.

1 change: 1 addition & 0 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ Contributors

* Kirstie Whitaker
* Jean-Baptiste Poline
* Victor Férat
Loading