From 1e95af715195653e0e88d56b733de19b65b53e0f Mon Sep 17 00:00:00 2001 From: yhan818 Date: Thu, 23 Sep 2021 13:10:12 -0700 Subject: [PATCH] grouper2.5 update --- CHANGELOG.md | 10 +++++ config/figshare.ini | 4 +- config/figshare_grouper25.ini | 75 ----------------------------------- docs/source/conf.py | 2 +- requiam/__init__.py | 2 +- setup.py | 2 +- 6 files changed, 15 insertions(+), 80 deletions(-) delete mode 100644 config/figshare_grouper25.ini diff --git a/CHANGELOG.md b/CHANGELOG.md index 48294c0..53c9b47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,17 @@ # Changelog + +## [v1.0.1](https://github.com/UAL-RE/ReQUIAM/tree/v1.0.1) (2021-09-15) +**Implemented enhancements:** + - Enhancement: Grouper v2.5 implemented. + [#161](https://github.com/UAL-RE/ReQUIAM/pull/161) + +**Closed issues:** + [#116](https://github.com/UAL-RE/ReQUIAM/pull/116) + ## [v1.0.0](https://github.com/UAL-RE/ReQUIAM/tree/v1.0.0) (2021-07-22) + **Implemented enhancements:** - Enhancement: Sphinx documentation with RTDs [#159](https://github.com/UAL-RE/ReQUIAM/pull/159) diff --git a/config/figshare.ini b/config/figshare.ini index f8b5428..8149d64 100644 --- a/config/figshare.ini +++ b/config/figshare.ini @@ -18,11 +18,11 @@ ldap_base_dn = dc=eds,dc=arizona,dc=edu ldap_user = figshare ldap_password = ***override*** grouper_host = grouper.iam.arizona.edu -grouper_base_path = grouper-ws/servicesRest/json/v2_2_001 +grouper_base_path = grouper-ws/servicesRest/json/v2_5_001 grouper_user = figshare grouper_password = ***override*** batch_size = 100 -batch_timeout = 60 +batch_timeout = 100 batch_delay = 0 sync_max = 1000 diff --git a/config/figshare_grouper25.ini b/config/figshare_grouper25.ini deleted file mode 100644 index 4ddc700..0000000 --- a/config/figshare_grouper25.ini +++ /dev/null @@ -1,75 +0,0 @@ -# -# Configuration for the "ReQUIAM" script. -# -# Note: This is for testing of Grouper v2.5 compatibility -# Only a change on grouper_host and grouper_base_path -# -# Parameters are loaded in the following order: -# -# 1. Global defaults. -# 2. Custom configuration through command-line flags -# - -# -# Global defaults for all groups. -# - -[global] -ldap_host = eds.iam.arizona.edu -ldap_base_dn = dc=eds,dc=arizona,dc=edu -ldap_user = figshare -ldap_password = ***override*** -grouper_host = grouper25.iam.arizona.edu -grouper_base_path = grouper-ws/servicesRest/json/v2_5_001 -grouper_user = figshare -grouper_password = ***override*** -batch_size = 100 -batch_timeout = 60 -batch_delay = 0 -sync_max = 1000 - -# Research themes CSV globals -csv_url_prefix = https://raw.githubusercontent.com/UAL-RE/ReQUIAM_csv -csv_version = master -csv_filename = requiam_csv/data/research_themes.csv -csv_url = %(csv_url_prefix)s/%(csv_version)s/%(csv_filename)s - -# Quota globals for default users -# 100MB (undergrad), 0.5GB (grad), 2GB (faculty/staff/dcc) -quota_list = [104857600, 536870912, 2147483648] -quota_class = ['ugrad', 'grad', 'faculty'] - -# Persistent storage path for logs -persistent_path = ***override*** - -# Log file -log_dir: logs -logfile_prefix: figshare_patrons - -# Testing stuff -uid = figshare08-test - -# Manual override files -portal_file = config/portal_manual.csv -quota_file = config/quota_manual.csv - -# Grouper groups CSV file -grouper_file = config/grouper_groups.csv - -# Google Sheet organization codes -[google] -sheet_id: 1f8tNxj96g_4NW6LWAIx8s3AxRoBbwRvFIxUXMAYyVlU -org_gid: 1251629208 -org_url: https://docs.google.com/spreadsheets/d/%(sheet_id)s/export?format=csv&gid=%(org_gid)s - -# Top level themes -maintheme_gid: 534072786 -maintheme_url: https://docs.google.com/spreadsheets/d/%(sheet_id)s/export?format=csv&gid=%(maintheme_gid)s - -# Subportals -subportal_gid: 2142935659 -subportal_url: https://docs.google.com/spreadsheets/d/%(sheet_id)s/export?format=csv&gid=%(subportal_gid)s - -quota_sheet_id: 12Rhfpz4aWIcOGOOu0Ev4sZNMiXvLr3FSl_83yRd3h4k -quota_gid: 0 -quota_url: https://docs.google.com/spreadsheets/d/%(quota_sheet_id)s/export?format=csv&gid=%(quota_gid)s diff --git a/docs/source/conf.py b/docs/source/conf.py index 9f8189f..b92cbc7 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -23,7 +23,7 @@ author = 'Chun Ly, UA Research Data Repository (ReDATA) Team' # The full version, including alpha/beta/rc tags -release = 'v1.0.0' +release = 'v1.0.1' # -- General configuration --------------------------------------------------- diff --git a/requiam/__init__.py b/requiam/__init__.py index b11a014..11877ec 100644 --- a/requiam/__init__.py +++ b/requiam/__init__.py @@ -1,7 +1,7 @@ from typing import Union from datetime import datetime -__version__ = "1.0.0" +__version__ = "1.0.1" CODE_NAME = 'ReQUIAM' diff --git a/setup.py b/setup.py index c31b6d7..5f86bea 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setup( name='requiam', - version='v1.0.0', + version='v1.0.1', packages=['requiam'], url='https://github.com/UAL-RE/ReQUIAM', license='MIT License',