Skip to content

Commit

Permalink
Merge branch 'main' into more-zip-name-fixing
Browse files Browse the repository at this point in the history
  • Loading branch information
mih authored Oct 27, 2023
2 parents 9a923ce + 7f030a4 commit ff07cbe
Show file tree
Hide file tree
Showing 73 changed files with 2,267 additions and 653 deletions.
162 changes: 162 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,162 @@
{
"projectName": "datalad-next",
"projectOwner": "datalad",
"repoType": "github",
"commitConvention": "angular",
"contributors": [
{
"login": "mih",
"name": "Michael Hanke",
"avatar_url": "https://avatars.githubusercontent.com/u/136479?v=4",
"profile": "http://psychoinformatics.de/",
"contributions": [
"bug",
"code",
"content",
"design",
"doc",
"financial",
"fundingFinding",
"ideas",
"infra",
"maintenance",
"mentoring",
"platform",
"projectManagement",
"review",
"talk",
"test",
"tool",
"userTesting"
]
},
{
"login": "catetrai",
"name": "catetrai",
"avatar_url": "https://avatars.githubusercontent.com/u/18424941?v=4",
"profile": "https://github.com/catetrai",
"contributions": [
"code",
"design",
"doc",
"ideas",
"test"
]
},
{
"login": "effigies",
"name": "Chris Markiewicz",
"avatar_url": "https://avatars.githubusercontent.com/u/83442?v=4",
"profile": "https://github.com/effigies",
"contributions": [
"maintenance",
"code"
]
},
{
"login": "mslw",
"name": "Michał Szczepanik",
"avatar_url": "https://avatars.githubusercontent.com/u/11985212?v=4",
"profile": "https://github.com/mslw",
"contributions": [
"bug",
"code",
"content",
"doc",
"example",
"ideas",
"infra",
"maintenance",
"review",
"talk",
"test",
"tutorial",
"userTesting"
]
},
{
"login": "jsheunis",
"name": "Stephan Heunis",
"avatar_url": "https://avatars.githubusercontent.com/u/10141237?v=4",
"profile": "https://jsheunis.github.io/",
"contributions": [
"bug",
"code",
"doc",
"ideas",
"maintenance",
"talk",
"userTesting"
]
},
{
"login": "bpoldrack",
"name": "Benjamin Poldrack",
"avatar_url": "https://avatars.githubusercontent.com/u/10498301?v=4",
"profile": "https://github.com/bpoldrack",
"contributions": [
"bug",
"code"
]
},
{
"login": "yarikoptic",
"name": "Yaroslav Halchenko",
"avatar_url": "https://avatars.githubusercontent.com/u/39889?v=4",
"profile": "https://github.com/yarikoptic",
"contributions": [
"bug",
"code",
"infra",
"maintenance",
"tool"
]
},
{
"login": "christian-monch",
"name": "Christian Mönch",
"avatar_url": "https://avatars.githubusercontent.com/u/17925232?v=4",
"profile": "https://github.com/christian-monch",
"contributions": [
"code",
"design",
"doc",
"ideas",
"review",
"test",
"userTesting"
]
},
{
"login": "adswa",
"name": "Adina Wagner",
"avatar_url": "https://avatars.githubusercontent.com/u/29738718?v=4",
"profile": "https://github.com/adswa",
"contributions": [
"a11y",
"bug",
"code",
"doc",
"example",
"maintenance",
"projectManagement",
"review",
"talk",
"test",
"tutorial",
"userTesting"
]
},
{
"login": "jwodder",
"name": "John T. Wodder II",
"avatar_url": "https://avatars.githubusercontent.com/u/98207?v=4",
"profile": "https://github.com/jwodder",
"contributions": [
"code",
"infra",
"test"
]
}
]
}
12 changes: 6 additions & 6 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ environment:
# to have `.overrides` be uniformly limited to instance overrides
KEYWORDS: not test_gh1811 and not test_librarymode
APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004
PY: 3.7
PY: 3.8
INSTALL_SYSPKGS:
# datalad-annex git remote needs something after git-annex_8.20211x
INSTALL_GITANNEX: git-annex -m snapshot
Expand All @@ -120,7 +120,7 @@ environment:
# because MIH does not know better
KEYWORDS: not test_gh1811 and not test_fake_gitlab and not test_dryrun
APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004
PY: 3.7
PY: 3.8
INSTALL_SYSPKGS:
# datalad-annex git remote needs something after git-annex_8.20211x
INSTALL_GITANNEX: git-annex -m snapshot
Expand All @@ -130,7 +130,7 @@ environment:
datalad.distribution
KEYWORDS: not test_invalid_args
APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004
PY: 3.7
PY: 3.8
INSTALL_SYSPKGS:
# datalad-annex git remote needs something after git-annex_8.20211x
INSTALL_GITANNEX: git-annex -m snapshot
Expand All @@ -139,7 +139,7 @@ environment:
DTS: >
datalad.local
APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004
PY: 3.7
PY: 3.8
INSTALL_SYSPKGS:
# datalad-annex git remote needs something after git-annex_8.20211x
INSTALL_GITANNEX: git-annex -m snapshot
Expand All @@ -151,7 +151,7 @@ environment:
datalad.tests
datalad.ui
APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004
PY: 3.7
PY: 3.8
INSTALL_SYSPKGS:
# datalad-annex git remote needs something after git-annex_8.20211x
INSTALL_GITANNEX: git-annex -m snapshot
Expand Down Expand Up @@ -285,7 +285,7 @@ test_script:
# run test selecion (--traverse-namespace needed from Python 3.8 onwards)
- cmd: python -m pytest -s -v -m "not (turtle)" -k "%KEYWORDS%" --cov=datalad_next --pyargs %DTS%
# also add --cov datalad, because some core test runs may not touch -next code
- sh: PATH=$PWD/../tools/coverage-bin:$PATH python -m pytest -s -v -m "not (turtle)" -k "$KEYWORDS" --cov=datalad_next --cov datalad --pyargs ${DTS}
- sh: python -m pytest -s -v -m "not (turtle)" -k "$KEYWORDS" --cov=datalad_next --cov datalad --cov-config=../.coveragerc --pyargs ${DTS}


after_test:
Expand Down
9 changes: 9 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
[run]
parallel = True
branch = True
data_file = ${COVERAGE_ROOT-.}/.coverage
omit =
# versioneer
*/_version.py

[paths]
source =
datalad_next/
*/datalad_next/

[report]
# show lines missing coverage in output
show_missing = True
39 changes: 39 additions & 0 deletions .github/workflows/mypy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Type annotation

on:
pull_request:
paths:
- 'datalad_next/**.py'
- '!**/tests/**.py'

jobs:
static-type-check:
runs-on: ubuntu-latest
steps:
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: 3.8
architecture: x64
- name: Checkout
uses: actions/checkout@v3
- name: Install mypy
run: python -m pip install mypy # you can pin your preferred version
- name: Get Python changed files
id: changed-py-files
uses: tj-actions/changed-files@v23
with:
files: |
*.py
**/*.py
- name: Type check changed files
if: steps.changed-py-files.outputs.any_changed == 'true'
run: |
# get any type stubs that mypy thinks it needs
mypy --install-types --non-interactive --follow-imports skip --ignore-missing-imports ${{ steps.changed-py-files.outputs.all_changed_files }}
# run mypy on the modified files only, and do not even follow imports.
# this results is a fairly superficial test, but given the overall
# state of annotations, we strive to become more correct incrementally
# with focused error reports, rather than barfing a huge complaint
# that is unrelated to the changeset someone has been working on
mypy --follow-imports skip --ignore-missing-imports --pretty --show-error-context ${{ steps.changed-py-files.outputs.all_changed_files }}
86 changes: 86 additions & 0 deletions .github/workflows/update-contributors.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
name: allcontributors-auto-detect

on:
push:
branches:
- main

jobs:
Update:
name: Generate
runs-on: ubuntu-latest
if: contains(github.repository, 'datalad/datalad-next')
steps:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Tributors Update
uses: con/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:

# Single text list (space separated) of parsers, leave unset to auto-detect
parsers: unset

# Update lookup with GitHub metadata
update_lookup: github

# Skip these users (example)
skip_users:

# INFO, DEBUG, ERROR, WARNING, etc.
log_level: DEBUG

# If files already exist and an init is done, force overwrite
force: true

# the minimum number of contributions required to add a user
threshold: 1

- name: Checkout New Branch
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BRANCH_AGAINST: "main"
run: |
printf "GitHub Actor: ${GITHUB_ACTOR}\n"
export BRANCH_FROM="contributors/update-$(date '+%Y-%m-%d')"
git remote set-url origin "https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git"
BRANCH_EXISTS=$(git ls-remote --heads origin ${BRANCH_FROM})
if [[ -z ${BRANCH_EXISTS} ]]; then
printf "Branch does not exist in remote.\n"
else
printf "Branch already exists in remote.\n"
exit 1
fi
git branch
git checkout -b "${BRANCH_FROM}" || git checkout "${BRANCH_FROM}"
git branch
git config --global user.name "github-actions"
git config --global user.email "[email protected]"
git status
if git diff-index --quiet HEAD --; then
export OPEN_PULL_REQUEST=0
printf "No changes\n"
else
export OPEN_PULL_REQUEST=1
printf "Changes\n"
git commit -a -m "Automated deployment to update contributors $(date '+%Y-%m-%d')
[skip ci]"
git push origin "${BRANCH_FROM}"
fi
echo "OPEN_PULL_REQUEST=${OPEN_PULL_REQUEST}" >> $GITHUB_ENV
echo "PULL_REQUEST_FROM_BRANCH=${BRANCH_FROM}" >> $GITHUB_ENV
echo "PULL_REQUEST_TITLE=[tributors] ${BRANCH_FROM}" >> $GITHUB_ENV
echo "PULL_REQUEST_BODY='Tributors update automated pull request.\n\n[skip ci]'" >> $GITHUB_ENV
- name: Open Pull Request
uses: vsoch/[email protected]
if: ${{ env.OPEN_PULL_REQUEST == '1' }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PULL_REQUEST_BRANCH: "main"
9 changes: 7 additions & 2 deletions .zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,12 @@
"orcid": "0000-0003-2917-3450"
},
{
"name": "Wodder II, John T."
"name": "Wodder II, John T.",
"orcid": "0000-0001-7106-2661"
},
{
"name": "Trainito, Caterina",
"orcid": "0000-0002-1713-8343"
}
],
"keywords": [
Expand All @@ -52,4 +57,4 @@
"access_right": "open",
"license": "MIT",
"upload_type": "software"
}
}
Loading

0 comments on commit ff07cbe

Please sign in to comment.