Merge pull request #412 from opencybersecurityalliance/develop

1.8.1

.github/workflows/publish-to-pypi.yml

@@ -38,4 +38,4 @@ jobs:
           # `build` is installed as a Python module, not a standalone commandline
           python -m build --sdist --wheel --outdir dist/ .
           twine check dist/*
-          twine upload --verbose dist/*
+          twine upload --verbose --skip-existing dist/*

CHANGELOG.rst

@@ -6,6 +6,20 @@ All notable changes to this project will be documented in this file.
 
 The format is based on `Keep a Changelog`_.
 
+Unreleased
+==========
+
+1.8.1 (2023-10-23)
+==================
+
+Fixed
+-----
+
+- Git LFS install failure in Dockerfile
+- Kestrel logo font rendering inconsistency
+- PyPI release error if version exists (GitHub workflow)
+- ``kestrel-jupyter`` 1.8.1: `jsonschema extra bug`_
+
 1.8.0 (2023-10-18)
 ==================
 
@@ -1127,3 +1141,4 @@ Added
 - First release of Kestrel Core.
 
 .. _Keep a Changelog: https://keepachangelog.com/en/1.0.0/
+.. _jsonschema extra bug: https://github.com/opencybersecurityalliance/kestrel-jupyter/issues/24 

GOVERNANCE.rst

@@ -83,7 +83,7 @@ A maintainer should release a new Kestrel runtime (PyPI package name: ``kestre-l
 
 #. After release check
 
-    - Check `kestrel_jupyter on PyPI`_ after a few minutes to confirm new package built and released.
+    - Check `kestrel-jupyter on PyPI`_ after a few minutes to confirm new package built and released.
     - May activate/pin the released version of Kestrel documentation at `readthedocs version control`_.
     - Announce the release at OCA Kestrel channel.
 
@@ -98,6 +98,6 @@ In the case of a vulnerability, please contact any of the maintainers via slack
 .. _branching model: https://nvie.com/posts/a-successful-git-branching-model
 .. _entity-based cyber reasoning: https://kestrel.readthedocs.io/en/latest/language.html#entity-based-reasoning
 .. _firepit: https://github.com/opencybersecurityalliance/firepit
-.. _kestrel_jupyter on PyPI: https://pypi.org/project/kestrel_jupyter/
+.. _kestrel-jupyter on PyPI: https://pypi.org/project/kestrel-jupyter/
 .. _readthedocs version control: https://readthedocs.org/projects/kestrel/versions/
 .. _README: README.rst

README.rst

@@ -1,30 +1,26 @@
-.. image:: https://github.com/opencybersecurityalliance/kestrel-lang/raw/develop/logo/logo_w_text.svg
-   :width: 432
+.. image:: https://github.com/opencybersecurityalliance/kestrel-lang/raw/develop/logo/logo_w_text.png
+   :width: 460
    :alt: Kestrel Threat Hunting Language
 
-.. image:: https://img.shields.io/pypi/pyversions/kestrel-lang
-        :target: https://www.python.org/
-        :alt: Python 3
+.. image:: https://readthedocs.org/projects/kestrel/badge/?version=latest
+        :target: https://kestrel.readthedocs.io/en/latest/?badge=latest
+        :alt: Documentation Status
 
-.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
-        :target: https://github.com/psf/black
-        :alt: Code Style: Black
+.. image:: https://img.shields.io/pypi/v/kestrel-core
+        :target: https://pypi.python.org/pypi/kestrel-core
+        :alt: Latest Version
+
+.. image:: https://img.shields.io/pypi/dm/kestrel-core
+        :target: https://pypistats.org/packages/kestrel-core
+        :alt: PyPI Downloads
 
 .. image:: https://codecov.io/gh/opencybersecurityalliance/kestrel-lang/branch/develop/graph/badge.svg?token=HM4ax10IW3
         :target: https://codecov.io/gh/opencybersecurityalliance/kestrel-lang
         :alt: Code Coverage
 
-.. image:: https://img.shields.io/pypi/v/kestrel-lang
-        :target: https://pypi.python.org/pypi/kestrel-lang
-        :alt: Latest Version
-
-.. image:: https://img.shields.io/pypi/dm/kestrel-lang
-        :target: https://pypistats.org/packages/kestrel-lang
-        :alt: PyPI Downloads
-
-.. image:: https://readthedocs.org/projects/kestrel/badge/?version=latest
-        :target: https://kestrel.readthedocs.io/en/latest/?badge=latest
-        :alt: Documentation Status
+.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
+        :target: https://github.com/psf/black
+        :alt: Code Style: Black
 
 |
 

containers/docker/Dockerfile

@@ -37,18 +37,21 @@ RUN apt-get update --yes && \
     xclip && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 
-# analytics prereq
-RUN curl https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | sh -
+# add git lfs repo
+RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
 
+# install git lfs
 RUN apt-get install --yes git-lfs
 
 RUN mkdir -p /opt/kaas && chown ${NB_UID}:${NB_UID} /opt/kaas
 
 # Switch back to jovyan to avoid accidental container runs as root
 USER ${NB_UID}
 
+RUN git lfs install
+
 # Install kestrel-JUPYTER
-RUN pip install kestrel_jupyter
+RUN pip install kestrel-jupyter
 
 # setup Jupyter
 RUN kestrel_jupyter_setup

docs/conf.py

@@ -35,7 +35,7 @@ def get_version():
 html_title = project
 html_theme = "sphinx_rtd_theme"
 highlight_language = "none"
-html_logo = "../logo/logo_w_text_white.svg"
+html_logo = "../logo/logo_w_text_white.png"
 html_theme_options = {
     'logo_only': True,
     'display_version': False,

logo/README.md

@@ -0,0 +1,3 @@
+#### Font
+
+Google Fonts: Actor