Skip to content

Commit

Permalink
Initial implementation
Browse files Browse the repository at this point in the history
This patch is a port of `case_utils.local_uuid` and its testing
infrastructure to an independent repository.

Signed-off-by: Alex Nelson <[email protected]>
  • Loading branch information
ajnelson-nist committed Nov 21, 2023
1 parent aba5d1c commit 518e29a
Show file tree
Hide file tree
Showing 30 changed files with 447 additions and 624 deletions.
9 changes: 9 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# This file lists the contributors responsible for the
# repository content. They will also be automatically
# asked to review any pull request made in this repository.

# Each line is a file pattern followed by one or more owners.
# The sequence matters: later patterns take precedence.

# FILES OWNERS
* @Cyber-Domain-Ontology/maintainers-global
79 changes: 79 additions & 0 deletions .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
# 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.

name: Continuous Integration

on:
push:
branches:
- main
- develop
pull_request:
branches:
- main
- develop
release:
types:
- published
schedule:
- cron: '15 5 * * TUE'

jobs:
build:

runs-on: ubuntu-latest
strategy:
matrix:
python-version:
- '3.8'
- '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: Pre-commit Checks
run: |
pip -q install pre-commit
pre-commit run --all-files
- name: Start from clean state
run: make clean
- name: Run tests
run: make PYTHON3=python check

# Build the binary wheel as well as the source tar
- name: Build Objects
run: |
pip install -q twine wheel
python setup.py sdist bdist_wheel
# Ensure the objects were packaged correctly and there wasn't an issue with
# the compilation or packaging process.
- name: Check Objects
run: twine check dist/*

# Upload the packages on all develop and main pipleines for test consumption
- name: Upload HTML Docs
uses: actions/upload-artifact@v3
with:
name: packages
path: ./dist/

# If this commit is the result of a Git tag, push the wheel and tar packages
# to the PyPi registry
- name: Publish to PyPI
if: github.event_name == 'release' && github.event.action == 'published'
run: twine upload --repository-url https://upload.pypi.org/legacy/ -u __token__ -p ${{ secrets.PYPI_API_TOKEN }} --skip-existing --verbose dist/*
26 changes: 10 additions & 16 deletions .github/workflows/ci.yml → .github/workflows/prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
#
# We would appreciate acknowledgement if the software is used.

name: Continuous Integration
# This workflow uses Make to review direct dependencies of this
# repository.

name: Prerelease

on:
push:
branches: [ main, develop ]
pull_request:
branches: [ main, develop ]
schedule:
- cron: '15 5 * * TUE'
branches:
- main

jobs:
build:
Expand All @@ -29,20 +29,14 @@ jobs:
strategy:
matrix:
python-version:
- '3.9'
- '3.11'
- '3.8'
- '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: Pre-commit Checks
run: |
pip -q install pre-commit
pre-commit run --all-files
- name: Start from clean state
run: make clean
- name: Run tests
run: make PYTHON3=python3 check
- name: Review dependencies
run: make check-supply-chain-pre-commit
49 changes: 0 additions & 49 deletions .github/workflows/supply-chain.yml

This file was deleted.

11 changes: 6 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
*.egg-info
*.done.log
*.egg-info/
*.swp
.DS_Store
.git_submodule_init.done.log
.venv-pre-commit
.idea/
.venv-pre-commit/
__pycache__
build
dist
build/
dist/
Empty file removed .gitmodules
Empty file.
14 changes: 14 additions & 0 deletions CONTRIBUTE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Contributing to CDO-Utility-Local-UUID

This project uses [the `pre-commit` tool](https://pre-commit.com/) for linting. The easiest way to install it is with `pip`:
```bash
pip install pre-commit
pre-commit --version
```

The `pre-commit` tool hooks into Git's commit machinery to run a set of linters and static analyzers over each change. To install `pre-commit` into Git's hooks, run:
```bash
pre-commit install
```

To support offline development, `make` or `make check` will install and configure `pre-commit` in any local Git clone.
31 changes: 9 additions & 22 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,8 @@ all: \

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

.git_submodule_init.done.log: \
.gitmodules
git submodule update --init
touch $@

# This virtual environment is meant to be built once and then persist, even through 'make clean'.
# If a recipe is written to remove this flag file, it should first run `pre-commit uninstall`.
.venv-pre-commit/var/.pre-commit-built.log:
Expand All @@ -55,7 +49,6 @@ all: \
touch $@

check: \
check-supply-chain-mypy \
.venv-pre-commit/var/.pre-commit-built.log
$(MAKE) \
PYTHON3=$(PYTHON3) \
Expand All @@ -64,16 +57,9 @@ 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 \
check-supply-chain-mypy

check-supply-chain-mypy: \
.git_submodule_init.done.log
$(MAKE) \
PYTHON3=$(PYTHON3) \
--directory tests \
check-mypy
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 \
Expand All @@ -83,12 +69,13 @@ check-supply-chain-pre-commit: \
.pre-commit-config.yaml

clean:
@rm -rf \
*.egg-info \
build \
dist
@$(MAKE) \
--directory tests \
clean
@rm -f \
.git_submodule_init.done.log

distclean: \
clean
@rm -rf \
build \
*.egg-info \
dist
84 changes: 45 additions & 39 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,75 +1,81 @@
# CASE Implementation Template: CLI Example
# CDO Local UUID Utility

[![Continuous Integration](https://github.com/casework/CASE-Implementation-Template-Python-CLI/actions/workflows/ci.yml/badge.svg)](https://github.com/casework/CASE-Implementation-Template-Python-CLI/actions/workflows/ci.yml)
![CASE Version](https://img.shields.io/badge/CASE%20Version-1.2.0-green)
[![Continuous Integration](https://github.com/Cyber-Domain-Ontology/CDO-Utility-Local-UUID/actions/workflows/cicd.yml/badge.svg)](https://github.com/Cyber-Domain-Ontology/CDO-Utility-Local-UUID/actions/workflows/cicd.yml)

_(Please see the [NIST disclaimer](#disclaimer).)_
This project provides a specialized UUID-generating function that can, on user request, cause a program to generate deterministic UUIDs. Its main purpose is to assist with generating version-controllable example data using consistent identifiers. This package intentionally includes mechanisms to make it difficult to activate this non-random mode without awareness of the caller.

This template repository is provided for those looking to develop command-line utilities using ontologies within the [Cyber Domain Ontology](https://cyberdomainontology.org) ecosystem, particularly [CASE](https://caseontology.org) and [UCO](https://unifiedcyberontology.org).

This template repository provides a [Make](https://en.wikipedia.org/wiki/Make_%28software%29)-based test workflow used in some other CASE projects. The workflow exercises this project as a command-line interface (CLI) application (under [`tests/cli/`](tests/cli/)), and as a package (under [`tests/package/`](tests/package/)).
## Disclaimer

This is only one possible application development style, and templates are available to support other styles. See for instance:
Participation by NIST in the creation of the documentation of mentioned software is not intended to imply a recommendation or endorsement by the National Institute of Standards and Technology, nor is it intended to imply that any specific software is necessarily the best available for the purpose.

* [casework/CASE-Mapping-Template-Python](https://github.com/casework/CASE-Mapping-Template-Python), which demonstrates an approach based on constructing Python `dict`s and checking generated results afterwards for CASE conformance with the [CASE Validation Action](https://github.com/kchason/case-validation-action).

Testing procedures run in _this_ repository are:
## Installation

* _GitHub Actions_: [Workflows](.github/workflows/) are defined to run testing as they would be run in a local command-line environment, reviewing on pushes and pull requests to certain branches.
* _Supply chain review_: [One workflow](.github/workflows/supply-chain.yml) checks dependencies on a schedule, confirming pinned dependencies are the latest, and loosely-pinned dependencies do not impact things like type review.
* _Type review_: `mypy --strict` reviews the package source tree and the tests directory.
* _Code style_: `pre-commit` reviews code patches in Continuous Integration testing and in local development. Running `make` will install `pre-commit` in a special virtual environment dedicated to the cloned repository instance.
* _Doctests_: Module docstrings' inlined tests are run with `pytest`.
* _CASE validation_: Unit tests that generate CASE graph files are written to run `case_validate` before considering the file "successfully" built.
* _Editable package installation_: The test suite installs the package in an "editable" mode into the virtual environment under `tests/venv/`. Activating the virtual environment (e.g. for Bash users, running `source tests/venv/bin/activate` from the repository's top source directory) enables "live code" testing.
* _Parallel Make runs_: Tests based on `make` have dependencies specified in a manner that enables `make --jobs` to run testing in parallel.
* _Directory-local Make runs_: The Makefiles are written to run regardless of the present working directory within the top source directory or the [`tests/`](tests/) directory, assuming `make check` has been run from the top source directory at least once. If a test is failing, `cd`'ing into that test's directory and running `make check` should reproduce the failure quickly and focus development effort.
This repository can be installed from PyPI or from source.


## Usage
### Installing from PyPI

To use the template, push the "Use this template" button on GitHub, and adapt files as suits your new project's needs. The README should be revised at least from its top to the "Versioning" section. Source files should be renamed and revised, and any other files with a `TODO` within it should be adjusted.
```bash
pip install cdo-local-uuid
```

After any revisions, running `make check` (or `make -j check`) from the top source directory should have unit tests continue to pass.
### Installing from source

_Below this line is sample text to use and adapt for your project. Most text above this line is meant to document the template, rather than projects using the template._
Users who wish to install pre-release versions and/or make improvements to the code base should install in this manner.

To install this software, clone this repository, and run `pip install .` from within this directory. (You might want to do this in a virtual environment.)
1. Clone this repository.
2. (Optional) Create and activate a virtual environment.
3. Run `pip install $x`, where `$x` is the path to the cloned repository.

This provides a standalone command:
Local installation is demonstrated in the `.venv.done.log` target of the `tests/` directory's [`Makefile`](tests/Makefile).

```bash
case_cli_example output.rdf
```

The tests build several examples of output for the command line mode, under [`tests/cli`](tests/cli/).
## Usage

The installation also provides a package to import:
[This module](cdo_local_uuid/__init__.py) provides a wrapper UUID generator, `local_uuid()`. It is intended to replace the Python call sequence `str(uuid.uuid4())`. In the default behavior, the two idioms behave the same:

```python
import case_cli_example
help(case_cli_example.foo)
>>> from uuid import uuid4
>>> from cdo_local_uuid import local_uuid
>>> str(uuid4())
'168ec24a-4920-43f5-85ad-9c6088b0cad8'
>>> local_uuid()
'bd203d75-f3eb-40fe-a266-b447beadbd54'
```

However, for some code-demonstration purposes, deterministic UUIDs might be desired, e.g. so a demonstration file including generated UUIDs can be regenerated and only change when the code changes, reducing version-control noise.

To see how to configure UUID generation, see the `_demo_uuid` function in [this module](cdo_local_uuid/__init__.py).


## Development status

This repository follows [CASE community guidance on describing development status](https://caseontology.org/resources/software.html#development_status), by adherence to noted support requirements.

The status of this repository is:

4 - Beta


## Versioning

This project follows [SEMVER 2.0.0](https://semver.org/) where versions are declared.


## Dependencies

This repository's primary module was originally part of the [`case-utils`](https://github.com/casework/CASE-Utilities-Python) package. It was separated to provide a package with no runtime dependencies outside of the Python standard library.


## Make targets

Some `make` targets are defined for this repository:
* `all` - Installs `pre-commit` for this cloned repository instance.
* `check` - Run unit tests. *NOTE*: The tests entail an installation of this project's source tree, including prerequisites downloaded from PyPI.
* `clean` - Remove test build files.
* `check` - Run unit tests.
* `clean` - Remove test build files, but not downloaded files.


## Licensing

Portions of this repository contributed by NIST are governed by the [NIST Software Licensing Statement](LICENSE#nist-software-licensing-statement).


## Disclaimer

Participation by NIST in the creation of the documentation of mentioned software is not intended to imply a recommendation or endorsement by the National Institute of Standards and Technology, nor is it intended to imply that any specific software is necessarily the best available for the purpose.
Loading

0 comments on commit 518e29a

Please sign in to comment.