Skip to content

Commit bdfe530

Browse files
qiaojunfengqiaojunfeng
authored
Merge branch 'main' into dojo_fr_pbesol
2 parents b804b78 + 7d141bc commit bdfe530

File tree

5 files changed

+170
-63
lines changed

5 files changed

+170
-63
lines changed

‎.cla/version1/CLA.md

+102
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
# Contributor License Agreement
2+
3+
> Adapted from the [Apache Software Foundation Individual Contributor License Agreement (ICLA)](https://www.apache.org/licenses/contributor-agreements.html) [version 2.2](https://www.apache.org/licenses/icla.pdf)
4+
5+
You accept and agree to the following terms and conditions for Your
6+
Contributions (present and future) that you submit to the GitHub organization
7+
"AiiDA Team" <https://github.com/aiidateam>.
8+
In return, the AiiDA Team shall not use Your Contributions in a way that
9+
is contrary to the public benefit or inconsistent with its nonprofit
10+
status and bylaws in effect at the time of the Contribution.
11+
Except for the license granted herein to the AiiDA Team and recipients of
12+
software distributed by the AiiDA Team, You reserve all right, title,
13+
and interest in and to Your Contributions.
14+
15+
1. Definitions.
16+
17+
"You" (or "Your") shall mean the copyright owner or legal entity
18+
authorized by the copyright owner that is making this Agreement
19+
with the AiiDA Team. For legal entities, the entity making a
20+
Contribution and all other entities that control, are controlled
21+
by, or are under common control with that entity are considered to
22+
be a single Contributor. For the purposes of this definition,
23+
"control" means (i) the power, direct or indirect, to cause the
24+
direction or management of such entity, whether by contract or
25+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
26+
outstanding shares, or (iii) beneficial ownership of such entity.
27+
"Contribution" shall mean any original work of authorship,
28+
including any modifications or additions to an existing work, that
29+
is intentionally submitted by You to the AiiDA Team for inclusion
30+
in, or documentation of, any of the products owned or managed by
31+
the AiiDA Team (the "Work"). For the purposes of this definition,
32+
"submitted" means any form of electronic, verbal, or written
33+
communication sent to the AiiDA Team or its representatives,
34+
including but not limited to communication on electronic mailing
35+
lists, source code control systems, and issue tracking systems that
36+
are managed by, or on behalf of, the AiiDA Team for the purpose of
37+
discussing and improving the Work, but excluding communication that
38+
is conspicuously marked or otherwise designated in writing by You
39+
as "Not a Contribution."
40+
41+
2. Grant of Copyright License. Subject to the terms and conditions of
42+
this Agreement, You hereby grant to the AiiDA Team and to
43+
recipients of software distributed by the AiiDA Team a perpetual,
44+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
45+
copyright license to reproduce, prepare derivative works of,
46+
publicly display, publicly perform, sublicense, and distribute Your
47+
Contributions and such derivative works.
48+
49+
3. Grant of Patent License. Subject to the terms and conditions of
50+
this Agreement, You hereby grant to the AiiDA Team and to
51+
recipients of software distributed by the AiiDA Team a perpetual,
52+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
53+
(except as stated in this section) patent license to make, have
54+
made, use, offer to sell, sell, import, and otherwise transfer the
55+
Work, where such license applies only to those patent claims
56+
licensable by You that are necessarily infringed by Your
57+
Contribution(s) alone or by combination of Your Contribution(s)
58+
with the Work to which such Contribution(s) was submitted. If any
59+
entity institutes patent litigation against You or any other entity
60+
(including a cross-claim or counterclaim in a lawsuit) alleging
61+
that your Contribution, or the Work to which you have contributed,
62+
constitutes direct or contributory patent infringement, then any
63+
patent licenses granted to that entity under this Agreement for
64+
that Contribution or Work shall terminate as of the date such
65+
litigation is filed.
66+
67+
4. You represent that you are legally entitled to grant the above
68+
license. If your employer(s) has rights to intellectual property
69+
that you create that includes your Contributions, you represent
70+
that you have received permission to make Contributions on behalf
71+
of that employer, that your employer has waived such rights for
72+
your Contributions to the AiiDA Team, or that your employer has
73+
executed a separate Corporate CLA with the AiiDA Team.
74+
75+
5. You represent that each of Your Contributions is Your original
76+
creation (see section 7 for submissions on behalf of others). You
77+
represent that Your Contribution submissions include complete
78+
details of any third-party license or other restriction (including,
79+
but not limited to, related patents and trademarks) of which you
80+
are personally aware and which are associated with any part of Your
81+
Contributions.
82+
83+
6. You are not expected to provide support for Your Contributions,
84+
except to the extent You desire to provide support. You may provide
85+
support for free, for a fee, or not at all. Unless required by
86+
applicable law or agreed to in writing, You provide Your
87+
Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
88+
OF ANY KIND, either express or implied, including, without
89+
limitation, any warranties or conditions of TITLE, NON-
90+
INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
91+
92+
7. Should You wish to submit work that is not Your original creation,
93+
You may submit it to the AiiDA Team separately from any
94+
Contribution, identifying the complete details of its source and of
95+
any license or other restriction (including, but not limited to,
96+
related patents, trademarks, and license agreements) of which you
97+
are personally aware, and conspicuously marking the work as
98+
"Submitted on behalf of a third-party: [named here]".
99+
100+
8. You agree to notify the AiiDA Team of any facts or circumstances of
101+
which you become aware that would make these representations
102+
inaccurate in any respect.

‎.cla/version1/signatures.json

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"signedContributors": [
3+
{
4+
"name": "qiaojunfeng",
5+
"id": 22841309,
6+
"comment_id": 2127760972,
7+
"created_at": "2024-05-23T18:08:19Z",
8+
"repoId": 247919090,
9+
"pullRequestNo": 52
10+
}
11+
]
12+
}

‎.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
run: pip install -e .[pre-commit,tests,analysis,dev]
2727

2828
- name: Run pre-commit
29-
run: pre-commit run --all-files || ( git status --short; git diff; exit 1 )
29+
run: pre-commit run || ( git status --short; git diff; exit 1 )
3030

3131
tests:
3232
runs-on: ubuntu-latest

‎.github/workflows/cla.yml

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
name: "CLA Assistant"
2+
on:
3+
issue_comment:
4+
types: [created]
5+
pull_request_target:
6+
types: [opened, closed, synchronize]
7+
8+
# explicitly configure permissions, in case your GITHUB_TOKEN workflow permissions are set to read-only in repository settings
9+
permissions:
10+
actions: write
11+
contents: write
12+
pull-requests: write
13+
statuses: write
14+
15+
jobs:
16+
CLAAssistant:
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: actions/create-github-app-token@v1
20+
id: app-token
21+
with:
22+
app-id: ${{ vars.APP_ID }}
23+
private-key: ${{ secrets.PRIVATE_KEY }}
24+
25+
- uses: contributor-assistant/[email protected]
26+
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby accept the CLA') || github.event_name == 'pull_request_target'
27+
env:
28+
# the default github token does not allow github action to create & push commit,
29+
# instead, we need to use a github app to generate a token
30+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
31+
GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
32+
# the below token should have repo scope and must be manually added by you in the repository's secret
33+
# This token is required only if you have configured to store the signatures in a remote repository/organization
34+
# PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
35+
with:
36+
path-to-signatures: ".cla/version1/signatures.json"
37+
path-to-document: "https://github.com/aiidateam/aiida-wannier90-workflows/blob/main/.cla/version1/CLA.md"
38+
# branch should not be protected
39+
branch: "main"
40+
allowlist: bot*
41+
42+
# the followings are the optional inputs - If the optional inputs are not given, then default values will be taken
43+
#remote-organization-name: enter the remote organization name where the signatures should be stored (Default is storing the signatures in the same repository)
44+
#remote-repository-name: enter the remote repository name where the signatures should be stored (Default is storing the signatures in the same repository)
45+
#create-file-commit-message: 'For example: Creating file for storing CLA Signatures'
46+
#signed-commit-message: 'For example: $contributorName has signed the CLA in $owner/$repo#$pullRequestNo'
47+
custom-notsigned-prcomment: 'Thank you for your submission, we really appreciate it. Like many open-source projects, we ask that you accept our [Contributor License Agreement](https://github.com/aiidateam/aiida-wannier90-workflows/blob/main/.cla/version1/CLA.md) before we can merge your contribution. You can accept the CLA by just copying the sentence below and posting it as a Pull Request Comment.'
48+
custom-pr-sign-comment: 'I have read the CLA Document and I hereby accept the CLA'
49+
custom-allsigned-prcomment: |
50+
All contributors have accepted the CLA ✅
51+
52+
---
53+
<sub>You might need to click the "Update/Rebase branch" button to update the pull request and rerun the GitHub actions to pass the CLA check.</sub>
54+
#lock-pullrequest-aftermerge: false - if you don't want this bot to automatically lock the pull request after merging (default - true)
55+
#use-dco-flag: true - If you are using DCO instead of CLA

‎src/aiida_wannier90_workflows/utils/parser/get_w90model_from_aiida.py

-62
This file was deleted.

0 commit comments

Comments
 (0)