Skip to content

Commit

Permalink
Merge pull request #13 from MannLabs/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
jalew188 authored Sep 4, 2023
2 parents 5d6ebbf + 919f014 commit 84c3bd9
Show file tree
Hide file tree
Showing 33 changed files with 4,624 additions and 3,956 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.1.1
current_version = 0.2.0
commit = True
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)(?P<build>\d+))?
Expand Down
19 changes: 6 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,20 +56,13 @@ Pythonnet will be automatically installed via pip.
requires you to add the ppa to your trusted sources!
2. Install pythonnet with `pip install pythonnet`.

#### For MacOS
#### For MacOS including M1/M2 platform

1. Install [brew](https://brew.sh) and pkg-config:
`brew install pkg-config` 3. Install Mono from mono-project website
[Mono Mac](https://www.mono-project.com/download/stable/)
2. Register the Mono-Path to your system: For macOS Catalina, open the
configuration of zsh via the terminal:

- Type `nano ~/.zshrc` to open the configuration of the terminal
- Append the mono path to your `PKG_CONFIG_PATH`:
`export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/Library/Frameworks/Mono.framework/Versions/Current/lib/pkgconfig:$PKG_CONFIG_PATH`.
- Save everything and execute `. ~/.zshrc`

3. Install pythonnet with `pip install pythonnet`.
1. Install [brew](https://brew.sh).
2. Install mono: `brew install mono`.
3. Create a pseudo mono folder: `sudo mkdir -p /Library/Frameworks/Mono.framework/Versions`.
4. Link homebrew mono to pseudo mono folder: `sudo ln -s /opt/homebrew/Cellar/mono/6.12.0.182 /Library/Frameworks/Mono.framework/Versions`. Where `6.12.0.182` is the brew-installed mono version, please check yours installed version.
5. Install pythonnet: `pip install pythonnet`.

------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion alpharaw/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def register_readers():
return "[WARN] pythonnet is not installed"

__project__ = "alpharaw"
__version__ = "0.1.1"
__version__ = "0.2.0"
__license__ = "Apache"
__description__ = "An open-source Python package to unify raw MS data accession and storage."
__author__ = "Mann Labs"
Expand Down
165 changes: 0 additions & 165 deletions alpharaw/bruker/ap_ff.py

This file was deleted.

Loading

0 comments on commit 84c3bd9

Please sign in to comment.