Skip to content

Commit

Permalink
Merge branch 'master' into release/v0.17.0
Browse files Browse the repository at this point in the history
  • Loading branch information
astrochun authored Apr 26, 2021
2 parents db9bdf2 + 62713ff commit 497fc6a
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ You can confirm installation via `conda list`
(figshare_patrons) $ conda list requiam
```

You should see that the version is `0.16.4`.
You should see that the version is `0.16.5`.

### Configuration Settings

Expand Down Expand Up @@ -298,7 +298,7 @@ v0.17.0:
* Chore: Refactor commonly set of codes in scripts #133
* Chore: Refactor using `redata-commons` package #145

v0.16.0 - v0.16.4:
v0.16.0 - v0.16.5:
* Merge `grouper_admin` and `grouper_query` modules #87
* Complete adoption of f-strings #118
* New pull request templates #120
Expand All @@ -307,6 +307,7 @@ v0.16.0 - v0.16.4:
* Minor: Update bug report template #131
* Update URLs for organization migration #132
* Bug: Argument parsing does not properly handle integer input for comparison #143
* Bug: int vs float parsing for Grouper settings #150

v0.15.0 - v0.15.1:
* GitHub actions for CI #105
Expand Down
2 changes: 1 addition & 1 deletion requiam/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "0.16.4"
__version__ = "0.16.5"

CODE_NAME = 'ReQUIAM'

Expand Down
2 changes: 1 addition & 1 deletion requiam/grouper.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ def check_group_exists(self, group, group_type):
try:
group_df = pd.DataFrame(result['WsFindGroupsResults']['groupResults'])

df_query = group_df.loc[group_df['displayExtension'] == group]
df_query = group_df.loc[group_df['displayExtension'] == str(group)]

status = True if not df_query.empty else False
return status
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

setup(
name='requiam',
version='v0.16.4',
version='v0.16.5',
packages=['requiam'],
url='https://github.com/UAL-ODIS/ReQUIAM',
license='MIT License',
Expand Down

0 comments on commit 497fc6a

Please sign in to comment.