Skip to content

Commit

Permalink
Merge pull request #89 from MannLabs/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
swillems authored Mar 22, 2021
2 parents 39ef5c6 + 4abe926 commit 5c8c4aa
Show file tree
Hide file tree
Showing 62 changed files with 10,518 additions and 2,585 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,10 @@ dmypy.json

# Misc
*.DS_Store
logs/*
alphatims/logs
*sandbox*
misc/releases/*
!docs/_build
misc/one_click_macos/alphatims.pkg
misc/one_click_macos/resources/LICENSE.txt
misc/one_click_macos/resources/alpha_logo.png
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ recursive-include alphatims *
include LICENSE.txt
include LICENSE-THIRD-PARTY.txt
include README.md
recursive-exclude alphatims/logs *
253 changes: 127 additions & 126 deletions README.md

Large diffs are not rendered by default.

20 changes: 9 additions & 11 deletions alphatims/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@


__project__ = "alphatims"
__version__ = "0.0.210126"
__license__ = "MIT"
__description__ = "A python package for Bruker TimsTOF raw data accession and visualization"
__author__ = "Sander Willems"
__version__ = "0.1.210317"
__license__ = "Apache"
__description__ = "A Python package for Bruker TimsTOF raw data accession and visualization"
__author__ = "Sander Willems, Eugenia Voytik"
__author_email__ = "[email protected]"
__github__ = "https://github.com/MannLabs/alphatims"
__keywords__ = [
Expand All @@ -18,11 +18,10 @@
]
__python_version__ = ">=3.8,<3.9"
__classifiers__ = [
"Development Status :: 3 - Alpha",
"Development Status :: 4 - Beta",
"Intended Audience :: Science/Research",
"License :: OSI Approved :: MIT License",
"Operating System :: POSIX :: Linux",
"Operating System :: Microsoft :: Windows",
"License :: OSI Approved :: Apache Software License",
"Operating System :: OS Independent",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3 :: Only",
Expand All @@ -37,8 +36,7 @@
}
__requirements__ = {
"": "requirements/requirements.txt",
"gui": "requirements/requirements_gui.txt",
"cli": "requirements/requirements_cli.txt",
"nbs": "requirements/requirements_nbs.txt",
"plotting": "requirements/requirements_plotting.txt",
"development": "requirements/requirements_development.txt",
}
__strict_requirements__ = True
Loading

0 comments on commit 5c8c4aa

Please sign in to comment.