Skip to content

Commit

Permalink
Merge branch 'hotfix/v0.16.3'
Browse files Browse the repository at this point in the history
 - Fix version conflicts in README.md, setup.py and __init__.py

# Conflicts:
#	README.md
#	requiam/__init__.py
#	setup.py
  • Loading branch information
astrochun committed Apr 2, 2021
2 parents 500ae3f + aefab9a commit 512c075
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 19 deletions.
21 changes: 10 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
# ![ReDATA EDS Query and Update for Identity and Access Management](ReQUIAM_full.png)

[![Build Status](https://travis-ci.com/ualibraries/ReQUIAM.svg?branch=master)](https://travis-ci.com/ualibraries/ReQUIAM)

[![GitHub build](https://github.com/ualibraries/ReQUIAM/workflows/Python%20package/badge.svg?)](https://github.com/ualibraries/ReQUIAM/actions?query=workflow%3A%22Python+package%22)
![GitHub top language](https://img.shields.io/github/languages/top/ualibraries/ReQUIAM)
![GitHub release (latest by date)](https://img.shields.io/github/v/release/ualibraries/ReQUIAM)
![GitHub](https://img.shields.io/github/license/ualibraries/ReQUIAM?color=blue)
[![GitHub build](https://github.com/UAL-ODIS/ReQUIAM/workflows/Python%20package/badge.svg?)](https://github.com/UAL-ODIS/ReQUIAM/actions?query=workflow%3A%22Python+package%22)
![GitHub top language](https://img.shields.io/github/languages/top/UAL-ODIS/ReQUIAM)
![GitHub release (latest by date)](https://img.shields.io/github/v/release/UAL-ODIS/ReQUIAM)
![GitHub](https://img.shields.io/github/license/UAL-ODIS/ReQUIAM?color=blue)

- [Overview](#overview)
- [Getting Started](#getting-started)
Expand Down Expand Up @@ -89,7 +87,7 @@ Next, clone this repository into a parent folder:

```
(figshare_patrons) $ cd /path/to/parent/folder
(figshare_patrons) $ git clone https://github.com/ualibraries/ReQUIAM.git
(figshare_patrons) $ git clone https://github.com/UAL-ODIS/ReQUIAM.git
```

With the activated `conda` environment, you can install with the `setup.py` script:
Expand All @@ -107,7 +105,7 @@ You can confirm installation via `conda list`
(figshare_patrons) $ conda list requiam
```

You should see that the version is `0.16.2`.
You should see that the version is `0.16.3`.

### Configuration Settings

Expand Down Expand Up @@ -276,7 +274,7 @@ flag to implement on the production stem, `figshare`.
## Versioning

We use [SemVer](http://semver.org/) for versioning. For the versions available,
see the [tags on this repository](https://github.com/ualibraries/ReQUIAM/tags).
see the [tags on this repository](https://github.com/UAL-ODIS/ReQUIAM/tags).

## Continuous Integration

Expand All @@ -296,13 +294,14 @@ Currently, there are two GitHub Action workflows:
A list of released features and their issue number(s).
List is sorted from moderate to minor revisions for reach release.

v0.16.0 - v0.16.2:
v0.16.0 - v0.16.3:
* Merge `grouper_admin` and `grouper_query` modules #87
* Complete adoption of f-strings #118
* New pull request templates #120
* CI build testing for Python 3.9 #121
* Update files to reflect ReQUIAM_csv org change #137
* Minor: Update bug report template #131
* Update URLs for organization migration #132

v0.15.0 - v0.15.1:
* GitHub actions for CI #105
Expand Down Expand Up @@ -394,7 +393,7 @@ v0.1.0:
* Damian Romero ([@damian-romero](https://www.github.com/damian-romero)) - [University of Arizona Libraries](https://github.com/ualibraries), [Office of Digital Innovation and Stewardship](https://github.com/UAL-ODIS)

See also the list of
[contributors](https://github.com/ualibraries/ReQUIAM/contributors) who participated in this project.
[contributors](https://github.com/UAL-ODIS/ReQUIAM/contributors) who participated in this project.


## License
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.2"
__version__ = "0.16.3"


class TimerClass(object):
Expand Down
2 changes: 1 addition & 1 deletion requiam/logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class LogClass:
Main class to log information to stdout and ASCII logfile
Note: This code is identical to the one used in DataRepository_research_themes:
https://github.com/ualibraries/DataRepository_research_themes
https://github.com/UAL-ODIS/ReQUIAM_csv
To use:
log = LogClass(log_dir, logfile).get_logger()
Expand Down
2 changes: 1 addition & 1 deletion scripts/add_grouper_groups
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ if __name__ == '__main__':
ReQUIAM version: {__version__}
ReQUIAM commit hash: {git_short_commit}
Created by Chun Ly
Issues/Suggestions? Submit a GitHub ticket: https://github.com/ualibraries/ReQUIAM/issues/new/choose
Issues/Suggestions? Submit a GitHub ticket: https://github.com/UAL-ODIS/ReQUIAM/issues/new/choose
"""
print(banner_message)

Expand Down
2 changes: 1 addition & 1 deletion scripts/get_org_code_numbers
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ if __name__ == '__main__':
ReQUIAM version: {__version__}
ReQUIAM commit hash: {git_short_commit}
Created by Chun Ly
Issues? Submit a GitHub ticket: https://github.com/ualibraries/ReQUIAM/issues/new
Issues? Submit a GitHub ticket: https://github.com/UAL-ODIS/ReQUIAM/issues/new
"""
print(banner_message)

Expand Down
2 changes: 1 addition & 1 deletion scripts/script_run
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ if __name__ == '__main__':
ReQUIAM version: {__version__}
ReQUIAM commit hash: {git_short_commit}
Created by Chun Ly
Issues? Submit a GitHub ticket: https://github.com/ualibraries/ReQUIAM/issues/new
Issues? Submit a GitHub ticket: https://github.com/UAL-ODIS/ReQUIAM/issues/new
"""
print(banner_message)

Expand Down
2 changes: 1 addition & 1 deletion scripts/user_update
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ if __name__ == '__main__':
ReQUIAM version: {__version__}
ReQUIAM commit hash: {git_short_commit}
Created by Chun Ly
Issues? Submit a GitHub ticket: https://github.com/ualibraries/ReQUIAM/issues/new
Issues? Submit a GitHub ticket: https://github.com/UAL-ODIS/ReQUIAM/issues/new
"""
print(banner_message)

Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

setup(
name='requiam',
version='v0.16.2',
version='v0.16.3',
packages=['requiam'],
url='https://github.com/ualibraries/ReQUIAM',
url='https://github.com/UAL-ODIS/ReQUIAM',
license='MIT License',
author='Chun Ly',
author_email='[email protected]',
Expand Down

0 comments on commit 512c075

Please sign in to comment.