Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/rasbt/biopandas
Browse files Browse the repository at this point in the history
  • Loading branch information
rasbt committed Jun 7, 2017
2 parents 935aca9 + ec23007 commit f086ffc
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 7 deletions.
2 changes: 1 addition & 1 deletion biopandas/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
# Project Website: http://rasbt.github.io/biopandas/
# Code Repository: https://github.com/rasbt/biopandas

__version__ = '0.2.2dev'
__version__ = '0.2.2'
__author__ = "Sebastian Raschka <mail@sebastianraschka.com>"
7 changes: 4 additions & 3 deletions docs/sources/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
The CHANGELOG for the current development version is available at
[https://github.com/rasbt/biopandas/blob/master/docs/sources/CHANGELOG.md](https://github.com/rasbt/biopandas/blob/master/docs/sources/CHANGELOG.md).

### 0.2.2dev (TBD)
### 0.2.2 (06-07-2017)

##### Downloads

Expand All @@ -12,11 +12,12 @@ The CHANGELOG for the current development version is available at

##### New Features

- New `PandasPdb.pdb_path` and `PandasMol2.mol2_path` attributes that store the location of the data file last read.
- -

##### Changes

- Add meaningful error message if attempting to overwrite the `df` attributes of `PandasMol2` and `PandasPdb` directly.
- Raises a meaningful error message if attempting to overwrite the `df` attributes of `PandasMol2` and `PandasPdb` directly.
- Added `PandasPdb.pdb_path` and `PandasMol2.mol2_path` attributes that store the location of the data file last read.

##### Bug Fixes

Expand Down
7 changes: 6 additions & 1 deletion docs/sources/api_subpackages/biopandas.mol2.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
biopandas version: 0.2.1
biopandas version: 0.2.2dev
## PandasMol2

*PandasMol2()*
Expand All @@ -21,6 +21,11 @@ Object for working with Tripos Mol2 structure files.

ID, code, or name of the molecule stored


- `pdb_path` : str

Location of the MOL2 file that was read in via `read_mol2`

### Methods

<hr>
Expand Down
9 changes: 8 additions & 1 deletion docs/sources/api_subpackages/biopandas.pdb.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
biopandas version: 0.2.1
biopandas version: 0.2.2dev
## PandasPdb

*PandasPdb()*
Expand All @@ -20,6 +20,13 @@ Object for working with Protein Databank structure files.
PDB file contents in raw text format


- `pdb_path` : str

Location of the PDB file that was read in via `read_pdb`
or URL of the page where the PDB content was fetched from
if `fetch_pdb` was called


- `header` : str

PDB file description
Expand Down
28 changes: 27 additions & 1 deletion docs/sources/api_subpackages/biopandas.testutils.md
Original file line number Diff line number Diff line change
@@ -1 +1,27 @@
biopandas version: 0.2.1
biopandas version: 0.2.2dev
## assert_raises

*assert_raises(exception_type, message, func, *args, **kwargs)*

Check that an exception is raised with a specific message

**Parameters**

- `exception_type` : exception

The exception that should be raised

- `message` : str (default: None)

The error message that should be raised. Ignored if False or None

- `func` : callable

The function that raises the exception

- `*args` : positional arguments to `func`


- `**kwargs` : keyword arguments to `func`


0 comments on commit f086ffc

Please sign in to comment.