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

Add REUSE metadata #61

Merged
merged 12 commits into from
Apr 25, 2021
Merged

Conversation

chatcannon
Copy link
Collaborator

Fixes #34

The flake8 configuration is in tox.ini instead.
There are additional committers who have made changes to this
file, but only adding new colIDs etc., which is not copyrightable.

Here is the corresponding git-shortlog output:

Dennis (1):
      Improved compatibility with .mpr files

Peter Attia (1):
      Update BioLogic.py

Tim (3):
      improved parsing for PEIS files
      new column types
      new column types

dennissheberla (2):
      Improved compatibility with .mpt files
      Improved compatibility with new .mpr files

nhshetty-99 (3):
      Added colIDs 74 and 462 to VMPdata_colID_dtype_map
      Changed colID 74 and 462 order from original addition
      Added column 469 to BioLogic.py
The files with other licences are not included in the wheel package
Exclude the MIT licence since the GitHub CodeQL file is not packaged.
@chatcannon chatcannon requested a review from bcolsen March 20, 2021 14:33
Copy link
Contributor

@bcolsen bcolsen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. It doesn't look like the test CI test is competing however.

@chatcannon
Copy link
Collaborator Author

It seems like Travis is moving from travis-ci.org to travis-ci.com and this means that previously configured CI pipelines got disabled.

@chatcannon
Copy link
Collaborator Author

It looks like the Travis CI build is now running: https://github.com/echemdata/galvani/pull/61/checks?check_run_id=2432514444

@chatcannon
Copy link
Collaborator Author

The travis-ci.com checks appeared as a separate item in the "Pull request checks" list - the old travis-ci.org checks were still there and still marked as "waiting". I had to change the "Require status checks to pass before merging" configuration here: https://github.com/echemdata/galvani/settings/branch_protection_rules/5300725

@chatcannon chatcannon merged commit dd605e8 into echemdata:master Apr 25, 2021
@chatcannon chatcannon deleted the fsfe-reuse-metadata branch April 25, 2021 17:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add SPDX / fsfe-reuse metadata
2 participants