Skip to content

Commit

Permalink
Merge branch 'master' into sts-related-updates
Browse files Browse the repository at this point in the history
  • Loading branch information
majensen committed Jul 25, 2023
2 parents 6887a3a + e9ae329 commit 3599152
Show file tree
Hide file tree
Showing 22 changed files with 4,022 additions and 2,161 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ on: [push, pull_request]

jobs:
ci-cd:
uses: CBIIT/bento-workflows/.github/workflows/ci-cd.yml@v2.1
uses: CBIIT/bento-workflows/.github/workflows/ci-cd.yml@v2.2.10
with:
workdir: ./python
pkg_name: bento-meta
secrets: inherit
2,123 changes: 1,128 additions & 995 deletions python/poetry.lock

Large diffs are not rendered by default.

22 changes: 15 additions & 7 deletions python/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ include = ["logs/log.ini"]

[tool.poetry.dependencies]
python = "^3.8"
PyYAML = ">=6"
PyYAML = ">=6.0.1"
delfick-project = "^0.7.9"
neo4j = ">=4.0"
nanoid = "^2.0.0"
Expand All @@ -44,23 +44,31 @@ numpy = {version = "^1.23.5", optional = true}
pandas = {version = "^1.5.2", optional = true}
spacy = {version = "^3.4.3", optional = true}
click = {version = "^8.1.3", optional = true}
#scispacy = {version = "^0.5.1", optional = true}
liquichange = "^0.2.1"
bento-mdf = "^0.9.1"

[tool.poetry.extras]
Tools = ["click", "numpy", "pandas", "spacy"] #"scispacy",
Tools = ["click", "numpy", "pandas", "spacy", "liquichange"]

[tool.poetry.group.dev.dependencies]
pytest = "^7.2.0"
# docker-compose = {version = "^1.29.2", optional = true}
pytest-docker = "^1.0.1"
requests = "^2.28.1"
myst-nb = {version = "^0.17.1", python = "^3.8"}
sphinx-autoapi = "^2.0.1"
sphinx-rtd-theme = "^1.1.1"
python-semantic-release = "^7.33.0"
pytest-cov = "^4.0.0"
liquichange = "^0.2.1"
sphinx = "5.3.0"
bento-mdf = "^0.7.2"
bento-mdf = "^0.9.1"

[tool.poetry.scripts]
"compare_models" = { reference = "scripts/compare_models.py", type = "file", extras = ["click", "spacy", "pandas"]}
"compare_val_set_terms" = { reference = "scripts/compare_val_set_terms.py", type = "file", extras = ["click", "pandas"] }
"make_model_changelog" = {reference = "scripts/make_model_changelog.py", type = "file", extras = ["click", "liquichange"]}
"make_diff_changelog" = {reference = "scripts/make_diff_changelog.py", type = "file", extras = ["click", "liquichange"]}
"make_mapping_changelog" = {reference = "scripts/make_mapping_changelog.py", type = "file", extras = ["click", "liquichange"]}

[build-system]
requires = ["poetry-core"]
Expand All @@ -76,5 +84,5 @@ upload_to_release = true
upload_to_pypi = false
remove_dist = false
patch_without_tag = true
major_on_zero = false # while major version on 0.y.z, won't bump to 1.0.0
version_source = "tag" # temp?
major_on_zero = false
version_source = "tag"
128 changes: 0 additions & 128 deletions python/scripts/clean_cda_map_excel.py

This file was deleted.

Loading

0 comments on commit 3599152

Please sign in to comment.