Skip to content

Commit

Permalink
Version bump, more authors, cleaned up README
Browse files Browse the repository at this point in the history
  • Loading branch information
Ben-Drucker authored Aug 19, 2024
1 parent bfe72c3 commit 4841d66
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 36 deletions.
7 changes: 3 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
Package: PNNL.DMS.utils
Type: Package
Title: Tools for accessing PNNL's Data Management System
Version: 0.2.0
Author: Vladislav Petyuk, Michael Nestor, Jamie Moon
Version: 0.3.0
Author: Vladislav Petyuk, Michael Nestor, Shane Kelly, Tyler Sagendorf, Ben Drucker, Jamie Moon, Camilo Posso, Matthew Monroe, David JM
Maintainer: Vladislav Petyuk <vladislav.petyuk@pnnl.gov>
Description: More about what it does (maybe more than one line)
Use four spaces when indenting paragraphs within the Description.
Description: Tools for accessing PNNL's Data Management System, including accessing the PostgreSQL database
License: Artistic-2.0
Encoding: UTF-8
RoxygenNote: 7.3.2
Expand Down
32 changes: 0 additions & 32 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,38 +14,6 @@ remotes::install_github("PNNL-Comp-Mass-Spec/PNNL.DMS.utils")
library(PNNL.DMS.utils)
```

## MacOS installation

1. Install [Homebrew](https://brew.sh/)
2. Install libraries and utilities with the commands
```Shell
brew install unixodbc
brew install freetds
```
Note: depending on your privileges, you may need to prepend `sudo` to the above commands.
<!--Note, the `--with-unixodbc` option in freetds installation is deprecated.-->

3. Create a configuration file `~/.odbcinst.ini` and add
```INI
[FreeTDS]
Driver = <driver_location>
```
- The `<driver_location>` varies depending on your Mac's architecture. To determine the architecture, navigate to <br> System Settings > General > About > Chip
- On Intel-based Macs, `<driver_location>` is `/usr/local/lib/libtdsodbc.so`.
- On Macs with Apple Silicon (e.g., Macs whose chip is an M1, M2, or variant thereof), `<driver_location>` is `/opt/homebrew/lib/libtdsodbc.so`.
Note: If your location of `libtdsodbc.so` differs, use the proper location.
4. In October 2023, it was discovered that there was a change to the `odbc` package in R that prevented the FreeTDS driver from being found on Macs with Apple Silicon chips. To fix this, do ONE of the following:
- Add the line `export ODBCSYSINI=/opt/homebrew/etc` to the `~/.zshrc` file (or profile file for your default shell) OR;
- reinstall the `odbc` package from source using the following commands:
```R
remove.packages("odbc")
install.packages("odbc", type = "source")
```
**For either fix, restart R before continuing.**
### Installation Tips

If within PNNL network there may be an error associated with `mount_smbfs`. This happens due to network access credentials. Options are either to wait or proactively access one of the PNNL servers. For example try mounting one of the public directories from the terminal window. Enter your network password once requested.
Expand Down

0 comments on commit 4841d66

Please sign in to comment.