Skip to content
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
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM mcr.microsoft.com/vscode/devcontainers/python:0-${VARIANT}
ARG NODE_VERSION="none"
RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
RUN sudo curl --location https://taskfile.dev/install.sh -o /install.sh
ENV PYTHONPATH=${PYTHONPATH}:/workspaces/archivist-python
ENV PYTHONPATH=${PYTHONPATH}:/workspaces/rkvst-python

# [Optional] If your pip requirements rarely change, uncomment this section to add them to the image.
# COPY requirements.txt /tmp/pip-tmp/
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Contributing to jitsuin-archivist #
# Contributing to rkvst-archivist #

Thanks for taking the time to contribute to jitsuin-archivist!
Thanks for taking the time to contribute to rkvst-archivist!

Contributing is not limited to writing code and submitting a PR. Feel free to submit an
[issue](https://github.com/jitsuin-inc/archivist-python/issues/new/choose) or comment on an existing one
[issue](https://github.com/rkvst/rkvst-python/issues/new/choose) or comment on an existing one
to report a bug, provide feedback, or suggest a new feature.

Of course, contributing code is more than welcome! To keep things simple, if you're fixing a small issue,
Expand Down
10 changes: 5 additions & 5 deletions DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,21 @@ Host *
```
> i.e. 'githubUserHandle' viz:
>
> git clone ssh-githubUserHandle:githubUserHandle/archivist-python.git
> git clone ssh-githubUserHandle:githubUserHandle/rkvst-python.git
>


```bash
mkdir githubUserHandle
cd githubUserHandle
git clone ssh-githubUserHandle:githubUserHandle/archivist-python.git
git clone ssh-githubUserHandle:githubUserHandle/rkvst-python.git
```

Enter the new cloned fork and add the original upstream repo as a remote:

```bash
cd archivist-python
git remote add upstream ssh-githubUserHandle:jitsuin-inc/archivist-python.git
cd rkvst-python
git remote add upstream ssh-githubUserHandle:rkvst/rkvst-python.git
git remote -v
```

Expand Down Expand Up @@ -305,7 +305,7 @@ Push the changes upstream(the set-upstream option is only required the first tim
git push --set-upstream origin dev/githubUserHandle/some-proposed-fix
```

Enter the github ui at https://github.com/jitsuin-inc/archivist-python and
Enter the github ui at https://github.com/rkvst/rkvst-python and
generate a pull request.

Reviewers will be notified when a PR is generated and you will receive feedback.
Expand Down
10 changes: 5 additions & 5 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ Use standard python pip utility:

.. code:: bash

python3 -m pip install jitsuin-archivist
python3 -m pip install rkvst-archivist

If your version of python3 is too old an error of this type or similar will be emitted:

.. note::

ERROR: Could not find a version that satisfies the requirement jitsuin-archivist (from versions: none)
ERROR: No matching distribution found for jitsuin-archivist
ERROR: Could not find a version that satisfies the requirement rkvst-archivist (from versions: none)
ERROR: No matching distribution found for rkvst-archivist

Example
=============
Expand Down Expand Up @@ -207,7 +207,7 @@ Python

def run(arch: Archivist, args):

LOGGER.info("Using version %s of jitsuin-archivist", about.__version__)
LOGGER.info("Using version %s of rkvst-archivist", about.__version__)
LOGGER.info("Namespace %s", args.namespace)

with open(args.yamlfile, "r", encoding="utf-8") as y:
Expand All @@ -234,7 +234,7 @@ Python
Command Line
------------

This functionality is also available with the CLI tool :code:`archivist_runner`, which is bundled with version v0.10 onwards of the :code:`jitsuin-archivist`.
This functionality is also available with the CLI tool :code:`archivist_runner`, which is bundled with version v0.10 onwards of the :code:`rkvst-archivist`.

You can verify the installation by running the following:

Expand Down
8 changes: 4 additions & 4 deletions archivist/assets.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,17 +184,17 @@ def create_if_not_exists(
- RecordEvidence
- Attachments
attributes:
arc_display_name: Jitsuin Front Door
arc_display_name: RKVST Front Door
arc_firmware_version: "1.0"
arc_serial_number: das-j1-01
arc_description: Electronic door entry system to Jitsuin France
wavestone_asset_id: paris.france.jitsuin.das
arc_description: Electronic door entry system to RKVST France
wavestone_asset_id: paris.france.rkvst.das
location:
identity: locations/xxxxxxxxxxxxxxxxxxxxxxxxxx
location:
selector:
- display_name
display_name: Jitsuin Paris
display_name: RKVST Paris
description: Sales and sales support for the French region
latitude: 48.8339211,
longitude: 2.371345,
Expand Down
2 changes: 1 addition & 1 deletion archivist/cmds/runner/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

def run(arch: archivist.Archivist, args):

LOGGER.info("Using version %s of jitsuin-archivist", about.__version__)
LOGGER.info("Using version %s of rkvst-archivist", about.__version__)
LOGGER.info("Namespace %s", args.namespace)

# if namespace is specified on the commandline then override any environment
Expand Down
2 changes: 1 addition & 1 deletion archivist/cmds/template/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

def run(arch: "type_helper.Archivist", args):

LOGGER.info("Using version %s of jitsuin-archivist", about.__version__)
LOGGER.info("Using version %s of rkvst-archivist", about.__version__)
LOGGER.info("Namespace %s", args.namespace)

path = PurePath(args.template)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@
"metadata": {},
"outputs": [],
"source": [
"URL = \"https://app.rkvst.io\"\n",
"URL = \"https://app.dev-paul-0.wild.jitsuin.io\""
"URL = \"https://app.rkvst.io\""
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion archivist/proof_mechanism.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
class ProofMechanism(Enum):
"""Enumerate proof mechanism options"""

#: Assets and events are proven using Jitsuin Khipus on the ledger
#: Assets and events are proven using RKVST Khipus on the ledger
KHIPU = 1
#: Assets and events are proven using a hash of the originator's evidence
SIMPLE_HASH = 2
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. Jitsuin Archivist documentation master file, created by
.. RKVST Archivist documentation master file, created by
sphinx-quickstart on Fri May 21 16:07:15 2021.
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
Expand Down
12 changes: 6 additions & 6 deletions docs/runner/components/assets_create_if_not_exists.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ Usually these field values are derived from an environment variable
steps:
- step:
action: ASSETS_CREATE_IF_NOT_EXISTS
description: Create a door in Paris at Jitsuin offices.
asset_label: Jitsuin Paris Front Door
description: Create a door in Paris at RKVST offices.
asset_label: RKVST Paris Front Door
selector:
- attributes:
- arc_display_name
Expand All @@ -37,19 +37,19 @@ Usually these field values are derived from an environment variable
- RecordEvidence
- Attachments
attributes:
arc_display_name: Jitsuin Paris Front Door
arc_display_name: RKVST Paris Front Door
arc_namespace: door entry
arc_display_type: door
arc_firmware_version: v1.0
arc_serial_number: das-j1-01
arc_description: Electronic door entry system to Jitsuin France
wavestone_asset_id: paris.france.jitsuin.das
arc_description: Electronic door entry system to RKVST France
wavestone_asset_id: paris.france.rkvst.das
location:
selector:
- display_name
- attributes:
- namespace
display_name: Jitsuin Paris
display_name: RKVST Paris
description: Sales and sales support for the French region
latitude: 48.8339211
longitude: 2.371345
Expand Down
2 changes: 1 addition & 1 deletion docs/runner/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ a dictionary. Usually the dictionary is read from a yaml or json file.
:language: python


This functionality is also available with the CLI tool :code:`archivist_runner`, which is bundled with version v0.10 onwards of the :code:`jitsuin-archivist` PIP installation.
This functionality is also available with the CLI tool :code:`archivist_runner`.

See the `installation instructions`_ for more information.

Expand Down
2 changes: 1 addition & 1 deletion docs/spelling_wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ iam
instantiation
iterable
jinja
jitsuin
jpg
json
jupyter
Expand All @@ -31,6 +30,7 @@ onwards
params
publicurl
py
rkvst
sbom
sboms
sbomType
Expand Down
2 changes: 1 addition & 1 deletion examples/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

def run(arch: Archivist, args):

LOGGER.info("Using version %s of jitsuin-archivist", about.__version__)
LOGGER.info("Using version %s of rkvst-archivist", about.__version__)
LOGGER.info("Namespace %s", args.namespace)

# if namespace is specified on the commandline then override any environment
Expand Down
2 changes: 1 addition & 1 deletion examples/scan_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def scan_test(arch, datestring, scanned_expected=False):
"attachments": [
{
"url": (
"https://raw.githubusercontent.com/jitsuin-inc/archivist-python/"
"https://raw.githubusercontent.com/rkvst/rkvst-python/"
"main/functests/test_resources/telephone.jpg"
),
"content_type": "image/jpg",
Expand Down
2 changes: 1 addition & 1 deletion functests/execattachments.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class TestAttachmentsCreate(TestCase):

TEST_DOCX_PATH = "functests/test_resources/loremipsum.docx"
TEST_DOCX_DOWNLOAD_PATH = "functests/test_resources/downloaded_loremipsum.docx"
TEST_IMAGE_PATH = "functests/test_resources/Jitsuin_Logo_RGB.jpg"
TEST_IMAGE_PATH = "functests/test_resources/rkvst_logo.png"
TEST_IMAGE_DOWNLOAD_PATH = "functests/test_resources/downloaded_image.jpg"

def setUp(self):
Expand Down
Binary file removed functests/test_resources/Jitsuin_Logo_RGB.jpg
Binary file not shown.
12 changes: 6 additions & 6 deletions functests/test_resources/door_entry_story.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
steps:
- step:
action: ASSETS_CREATE_IF_NOT_EXISTS
description: Create a door in Paris at Jitsuin offices.
asset_label: Jitsuin Paris Front Door
description: Create a door in Paris at RKVST offices.
asset_label: RKVST Paris Front Door
selector:
- attributes:
- arc_display_name
Expand All @@ -21,19 +21,19 @@ steps:
- RecordEvidence
- Attachments
attributes:
arc_display_name: Jitsuin Paris Front Door
arc_display_name: RKVST Paris Front Door
arc_namespace: !ENV ${ARCHIVIST_NAMESPACE:namespace}
arc_display_type: door
arc_firmware_version: "1.0"
arc_serial_number: das-j1-01
arc_description: Electronic door entry system to Jitsuin France
wavestone_asset_id: paris.france.jitsuin.das
arc_description: Electronic door entry system to RKVST France
wavestone_asset_id: paris.france.rkvst.das
location:
selector:
- display_name
- attributes:
- namespace
display_name: Jitsuin Paris
display_name: RKVST Paris
description: Sales and sales support for the French region
latitude: 48.8339211
longitude: 2.371345
Expand Down
Binary file added functests/test_resources/rkvst_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ fi
docker build \
--build-arg VERSION="$1" \
-f Dockerfile-builder \
-t archivist-python-builder .
-t rkvst-python-builder .
2 changes: 1 addition & 1 deletion scripts/builder.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ docker run \
-e TEST_DEBUG \
-e TEST_REFRESH_TOKEN \
-e GITHUB_REF \
archivist-python-builder \
rkvst-python-builder \
"$@"
2 changes: 1 addition & 1 deletion scripts/shell.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ docker run \
--rm -it \
-v $(pwd):/home/builder \
-u $(id -u):$(id -g) \
archivist-python-builder \
rkvst-python-builder \
"/bin/bash"
2 changes: 1 addition & 1 deletion scripts/venv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ rm -rf rkvst-venv
python3 -m venv rkvst-venv
source rkvst-venv/bin/activate
python3 -m pip install --force-reinstall wheel
python3 -m pip install --force-reinstall dist/jitsuin_archivist-*.whl
python3 -m pip install --force-reinstall dist/rkvst_archivist-*.whl
python3 -m pip install --force-reinstall -r docs/notebooks/requirements.txt
deactivate
8 changes: 4 additions & 4 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ statistics = True
max-line-length = 88

[metadata]
name = jitsuin-archivist
name = rkvst-archivist
author = RKVST Inc.
author_email = support@rkvst.com
description = RKVST Client
long_description = file: README.rst
long_description_content_type = text/x-rst
url = https://github.com/jitsuin-inc/archivist-python
url = https://github.com/rkvst/rkvst-python
license = MIT
license_files = LICENSE

Expand All @@ -25,8 +25,8 @@ classifiers =

project_urls =
Documentation = https://python.rkvst.com
Source = https://github.com/jitsuin-inc/archivist-python
Tracker = https://github.com/jitsuin-inc/archivist-python/issues
Source = https://github.com/rkvst/rkvst-python
Tracker = https://github.com/rkvst/rkvst-python/issues

[options]
install_requires = file: requirements.txt
Expand Down