Skip to content

Release 0.14.0 #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Nov 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,16 @@ jobs:
matrix:
python-version:
- '3.9'
- '3.11'
- '3.12'

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Pre-commit Checks
Expand All @@ -71,7 +71,7 @@ jobs:

# Upload the packages on all develop and main pipleines for test consumption
- name: Upload HTML Docs
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: packages
path: ./dist/
Expand Down
42 changes: 42 additions & 0 deletions .github/workflows/prerelease.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Portions of this file contributed by NIST are governed by the
# following statement:
#
# This software was developed at the National Institute of Standards
# and Technology by employees of the Federal Government in the course
# of their official duties. Pursuant to Title 17 Section 105 of the
# United States Code, this software is not subject to copyright
# protection within the United States. NIST assumes no responsibility
# whatsoever for its use by other parties, and makes no guarantees,
# expressed or implied, about its quality, reliability, or any other
# characteristic.
#
# We would appreciate acknowledgement if the software is used.

# This workflow uses Make to review direct dependencies of this
# repository.

name: Prerelease

on:
pull_request:
branches:
- main

jobs:
build:

runs-on: ubuntu-latest
strategy:
matrix:
python-version:
- '3.9'
- '3.12'

steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Review dependencies
run: make check-supply-chain-pre-commit
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
repos:
- repo: https://github.com/psf/black
rev: 23.1.0
rev: 23.11.0
hooks:
- id: black
- repo: https://github.com/pycqa/flake8
rev: 6.0.0
rev: 6.1.0
hooks:
- id: flake8
- repo: https://github.com/pycqa/isort
Expand Down
15 changes: 15 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ all: \
.venv-pre-commit/var/.pre-commit-built.log

.PHONY: \
check-supply-chain \
check-supply-chain-pre-commit \
download

.git_submodule_init.done.log: \
Expand Down Expand Up @@ -89,6 +91,19 @@ check: \
--directory tests \
check

# This target's dependencies potentially modify the working directory's Git state, so it is intentionally not a dependency of check.
check-supply-chain: \
check-supply-chain-pre-commit

# This target is scheduled to run as part of prerelease review.
check-supply-chain-pre-commit: \
.venv-pre-commit/var/.pre-commit-built.log
source .venv-pre-commit/bin/activate \
&& pre-commit autoupdate
git diff \
--exit-code \
.pre-commit-config.yaml

clean:
@$(MAKE) \
PYTHON3=$(PYTHON3) \
Expand Down
2 changes: 1 addition & 1 deletion case_utils/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
#
# We would appreciate acknowledgement if the software is used.

__version__ = "0.13.0"
__version__ = "0.14.0"

from . import local_uuid # noqa: F401
2 changes: 1 addition & 1 deletion case_utils/case_validate/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
details.)
"""

__version__ = "0.4.0"
__version__ = "0.5.0"

import argparse
import logging
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ license_files =
include_package_data = true
install_requires =
pandas
pyshacl
rdflib >= 6.2.0, < 7.0.0
pyshacl >= 0.24.0
rdflib < 8
requests
tabulate
packages = find:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"?name":"Johnny Lee Outlaw","?mbox":"mailto:[email protected]"},{"?name":"Peter Goodguy","?mbox":"mailto:[email protected]"}]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[["Johnny Lee Outlaw","mailto:[email protected]"],["Peter Goodguy","mailto:[email protected]"]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"?name":"Johnny Lee Outlaw","?mbox":"mailto:[email protected]"},{"?name":"Peter Goodguy","?mbox":"mailto:[email protected]"}]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[["Johnny Lee Outlaw","mailto:[email protected]"],["Peter Goodguy","mailto:[email protected]"]]
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,22 @@ def make_data_frame_to_json_table_text_parameters() -> (
"values",
]:
# Handle incompatible parameter pairings for JSON mode.
if use_index is False:
if json_orient not in {"split", "table"}:
if use_index is True:
if json_orient not in {
"columns",
"index",
"split",
"table",
}:
continue
elif use_index is False:
if json_orient not in {
"records",
"split",
"table",
"values",
}:
continue

yield (json_orient, output_mode, use_header, use_index)
else:
yield ("columns", output_mode, use_header, use_index)
Expand Down