Skip to content

Commit

Permalink
Merge branch 'uc-cdis-integration202402' into pcdc_dev
Browse files Browse the repository at this point in the history
grugna committed Feb 27, 2024
2 parents 7e294fc + 65e6cf9 commit 7eb202e
Showing 3 changed files with 1,113 additions and 915 deletions.
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Peregrine

[![Build Status](https://travis-ci.org/uc-cdis/peregrine.svg?branch=master)](https://travis-ci.org/uc-cdis/peregrine)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/f6128183864d4e5da5093eb72a3c9c97)](https://www.codacy.com/app/uc-cdis/peregrine?utm_source=github.com&utm_medium=referral&utm_content=uc-cdis/peregrine&utm_campaign=Badge_Grade)
[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/f6128183864d4e5da5093eb72a3c9c97)](https://www.codacy.com/app/uc-cdis/peregrine?utm_source=github.com&utm_medium=referral&utm_content=uc-cdis/peregrine&utm_campaign=Badge_Coverage)
[![Coverage Status](https://coveralls.io/repos/github/uc-cdis/peregrine/badge.svg)](https://coveralls.io/github/uc-cdis/peregrine)


Query interface to get insights into data in Gen3 Commons
2,005 changes: 1,103 additions & 902 deletions poetry.lock

Large diffs are not rendered by default.

20 changes: 9 additions & 11 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "peregrine"
version = "3.0.1"
version = "3.2.2"
description = "Query interface to get insights into data in Gen3 Commons"
authors = ["CTDS UChicago <cdis@uchicago.edu>"]
license = "Apache-2.0"
@@ -15,18 +15,18 @@ python = ">=3.9,<3.10"
authutils = ">=6.2.0"
datamodelutils = ">=1.0"
defusedxml = ">=0.5"
dictionaryutils = ">=3.0"
gen3dictionary = ">=2.0"
dictionaryutils = ">=3.4.10"
gen3dictionary = ">=2.0.3"
simplejson = ">=3.8"
stopit = ">=1.1"
Flask = ">=2.2.5"
Flask-Cors = ">=3.0.9"
# gen3authz = ">=0.2"
gen3authz = ">=0.2"
# gen3authz = {git = "https://github.com/grugna/gen3authz.git", rev = "0.2.4", subdirectory = "python"}
gen3authz = {git = "https://github.com/grugna/gen3authz.git", rev = "1.0.6"}
boto = "^2.36"
elasticsearch = "^1.2"
PyYAML = "~5.3.1"
# gen3authz = {git = "https://github.com/grugna/gen3authz.git", rev = "1.0.6"} Need to make this changes if times out.
# boto = "^2.36"
# elasticsearch = "^1.2"
PyYAML = ">=5.4.1"
dicttoxml = ">=1.5"
SQLAlchemy = "1.3.5"
graphene = ">=2.0,<3"
@@ -44,9 +44,7 @@ mock = ">=1.0"
pytest-flask = ">=0.15"
pytest-cov = ">=2.8"
indexclient = ">=2.1.1"
# TODO: Sheepdog tests have been temporarily disabled until Sheepdog (and indirectly Indexd) are updated to
# a more recent version of Flask.
# sheepdog = {git = "https://git@github.com/uc-cdis/sheepdog.git", branch = "fix/flask-upgrade"}
sheepdog = {git = "https://git@github.com/uc-cdis/sheepdog.git", rev = "5.1.3" }

[tool.poetry.plugins."peregrine.modules"]
"system" = "peregrine=peregrine.api:main"

0 comments on commit 7eb202e

Please sign in to comment.