From cd7f112a35564e666b4cd9017f48590dd6f1c754 Mon Sep 17 00:00:00 2001 From: Samuel Khuvis Date: Tue, 10 Dec 2024 14:55:26 -0800 Subject: [PATCH] Update camera traps version to 0.4.0 --- Cargo.lock | 2 +- Cargo.toml | 4 ++-- Makefile | 4 ++-- external_plugins/image_generating_plugin/pyproject.toml | 4 ++-- external_plugins/image_scoring_plugin/pyproject.toml | 2 +- installer/README.md | 4 ++-- installer/defaults.yml | 4 ++-- src/python/README.md | 8 ++++---- src/python/pyproject.toml | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 82103fb..2736e17 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -43,7 +43,7 @@ checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" [[package]] name = "camera-traps" -version = "0.3.3" +version = "0.4.0" dependencies = [ "anyhow", "chrono", diff --git a/Cargo.toml b/Cargo.toml index 4f8e937..b001f23 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "camera-traps" -version = "0.3.3" -edition = "2021" +version = "0.4.0" +edition = "2024" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/Makefile b/Makefile index 45177c5..afdfc60 100644 --- a/Makefile +++ b/Makefile @@ -4,8 +4,8 @@ # its value will be the tag assigned to all images that get built. # For example: # -# export TRAPS_REL=0.3.3 -# export TRAPS_REL=0.3. +# export TRAPS_REL=0.4.0 +# export TRAPS_REL=0.4. # # NOTE: Right now, building with tag `latest` is not supported. Instead, # build a semantic version and then tag the result as latest. diff --git a/external_plugins/image_generating_plugin/pyproject.toml b/external_plugins/image_generating_plugin/pyproject.toml index ced09d5..cdfb185 100644 --- a/external_plugins/image_generating_plugin/pyproject.toml +++ b/external_plugins/image_generating_plugin/pyproject.toml @@ -10,7 +10,7 @@ python = "^3.10" pillow = "^9.4.0" pyzmq = "^25.0.0" tapis-pyevents = "^0.1.0" -tapis-ctevents = "^0.3.1" +tapis-ctevents = "^0.4.0" [build-system] @@ -19,4 +19,4 @@ build-backend = "poetry.core.masonry.api" [tool.poetry.scripts] # TODO -image_generating_plugin = 'image_generating_plugin:main' \ No newline at end of file +image_generating_plugin = 'image_generating_plugin:main' diff --git a/external_plugins/image_scoring_plugin/pyproject.toml b/external_plugins/image_scoring_plugin/pyproject.toml index bf85353..66f2371 100644 --- a/external_plugins/image_scoring_plugin/pyproject.toml +++ b/external_plugins/image_scoring_plugin/pyproject.toml @@ -54,7 +54,7 @@ traitlets = "5.4.0" typing-extensions = "4.4.0" urllib3 = "1.26.14" wcwidth = "0.2.5" -tapis-ctevents = "^0.3.1" +tapis-ctevents = "^0.4.0" [build-system] requires = ["poetry-core"] diff --git a/installer/README.md b/installer/README.md index 5f07fa8..92143f4 100644 --- a/installer/README.md +++ b/installer/README.md @@ -67,7 +67,7 @@ Important Optional Configurations * `ct_version`: The release version (i.e., image tag) for the camera traps software container images. - * Example: 0.3.3 + * Example: 0.4.0 * `run_containers_as_user`: Whether to run all containers as the user's (i.e., the installer's) UID and GID. (Default: true) @@ -189,7 +189,7 @@ This is a complete list of all possible configurations. * `ct_version`: The release version (i.e., image tag) for the camera traps software container images - * Example: 0.3.3 + * Example: 0.4.0 * `host_config_dir`: Path on the host where configuration directory resides. diff --git a/installer/defaults.yml b/installer/defaults.yml index bc00f61..23e8edb 100644 --- a/installer/defaults.yml +++ b/installer/defaults.yml @@ -1,5 +1,5 @@ # General -ct_version: 0.3.3 +ct_version: 0.4.0 host_config_dir: ./config use_host_pid: true run_containers_as_user: true @@ -54,4 +54,4 @@ ckn_kafka_broker_address: 129.114.35.150 ckn_kafka_broker_port: 9092 ckn_enable_power_monitoring: true experiment_id: -user_id: \ No newline at end of file +user_id: diff --git a/src/python/README.md b/src/python/README.md index 5ea668d..a263647 100644 --- a/src/python/README.md +++ b/src/python/README.md @@ -4,18 +4,18 @@ A python library for working with the Camera Traps events messages. This library high-level convenience functions for easily sending and receiving Camera Traps events. There are two Docker images associated with this package, tapis/camera_traps_py and tapis/camera_traps_py_3.8; each -image provides a tag for each release, for example: tapis/camera_traps_py:0.3.3 and tapis/camera_traps_py_3.8:0.3.3 -for the 0.3.3 release. +image provides a tag for each release, for example: tapis/camera_traps_py:0.4.0 and tapis/camera_traps_py_3.8:0.4.0 +for the 0.4.0 release. The images bundle a test file that can be executed directly in the image; for example: ``` # start a container -docker run -it --rm --entrypoint=bash tapis/camera_traps_py:0.3.3 +docker run -it --rm --entrypoint=bash tapis/camera_traps_py:0.4.0 # run the tests python test_ctevents.py ``` The test suite was not written with any test framework so no reporting is provided. Since all that was used was simple -assert statements, if the program executes completely (with no exception output), then the tests have all "passed". \ No newline at end of file +assert statements, if the program executes completely (with no exception output), then the tests have all "passed". diff --git a/src/python/pyproject.toml b/src/python/pyproject.toml index be2d781..a6d6e19 100644 --- a/src/python/pyproject.toml +++ b/src/python/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "tapis-ctevents" -version = "0.3.1" +version = "0.4.0" description = "A module for working with Camera Traps events in Python." authors = ["Serena Shah "] license = "BSD 3-Clause"