Skip to content

Commit 26581e3

Browse files
committed
Merge remote-tracking branch 'origin/main' into error_handling_and_tests
2 parents 0fcb211 + 766dd75 commit 26581e3

File tree

7 files changed

+52
-27
lines changed

7 files changed

+52
-27
lines changed

.github/dependabot.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "pip"
4+
directory: "/"
5+
schedule:
6+
interval: "daily"
7+
- package-ecosystem: "github-actions"
8+
directory: "/"
9+
schedule:
10+
interval: "daily"

.github/workflows/Lint-and-test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
name: Python application
55

66
on:
7+
workflow_call:
78
push:
89
branches: [ "main" ]
910
pull_request:
@@ -25,7 +26,7 @@ jobs:
2526
steps:
2627
- uses: actions/checkout@v4
2728
- name: Install uv and set the python version
28-
uses: astral-sh/setup-uv@v5
29+
uses: astral-sh/setup-uv@v6
2930
with:
3031
python-version: "3.12"
3132
- name: Install dependencies
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: lint-and-test-nightly
2+
on:
3+
workflow_dispatch:
4+
schedule:
5+
- cron: "0 0 * * *"
6+
7+
8+
jobs:
9+
lint-and-test-nightly:
10+
uses: ./.github/workflows/Lint-and-test.yml

.github/workflows/python-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
name: python-package-distributions
7070
path: dist/
7171
- name: Sign the dists with Sigstore
72-
uses: sigstore/[email protected].0
72+
uses: sigstore/[email protected].1
7373
with:
7474
inputs: >-
7575
./dist/*.tar.gz

LICENSE

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,28 @@
1-
This is free and unencumbered software released into the public domain.
1+
BSD 3-Clause License
22

3-
Anyone is free to copy, modify, publish, use, compile, sell, or
4-
distribute this software, either in source code form or as a compiled
5-
binary, for any purpose, commercial or non-commercial, and by any
6-
means.
3+
Copyright (c) 2025, ISIS Experiment Controls Computing
74

8-
In jurisdictions that recognize copyright laws, the author or authors
9-
of this software dedicate any and all copyright interest in the
10-
software to the public domain. We make this dedication for the benefit
11-
of the public at large and to the detriment of our heirs and
12-
successors. We intend this dedication to be an overt act of
13-
relinquishment in perpetuity of all present and future rights to this
14-
software under copyright law.
5+
Redistribution and use in source and binary forms, with or without
6+
modification, are permitted provided that the following conditions are met:
157

16-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
19-
IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
20-
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
21-
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
22-
OTHER DEALINGS IN THE SOFTWARE.
8+
1. Redistributions of source code must retain the above copyright notice, this
9+
list of conditions and the following disclaimer.
2310

24-
For more information, please refer to <https://unlicense.org>
11+
2. Redistributions in binary form must reproduce the above copyright notice,
12+
this list of conditions and the following disclaimer in the documentation
13+
and/or other materials provided with the distribution.
14+
15+
3. Neither the name of the copyright holder nor the names of its
16+
contributors may be used to endorse or promote products derived from
17+
this software without specific prior written permission.
18+
19+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
22+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
23+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
24+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
25+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
26+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
27+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![](https://github.com/rerpha/saluki/blob/main/resources/logo.png)
1+
![](https://github.com/ISISComputingGroup/saluki/blob/main/resources/logo.png)
22

33
Serialise/deserialise flatbuffers blobs from kafka.
44
This currently deserialises https://github.com/ess-dmsc/python-streaming-data-types, but I am working to make it agnostic. Python bindings for the respective schema will need to be generated.

pyproject.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ dependencies = [
1010
"confluent-kafka"
1111
]
1212
readme = {file = "README.md", content-type = "text/markdown"}
13-
license = {file = "LICENSE"}
13+
license-files = ["LICENSE"]
1414

1515
[project.scripts]
1616
saluki = "saluki.main:main"
1717

1818
[project.urls]
19-
"Homepage" = "https://github.com/rerpha/saluki"
20-
"Bug Reports" = "https://github.com/rerpha/saluki/issues"
21-
"Source" = "https://github.com/rerpha/saluki"
19+
"Homepage" = "https://github.com/ISISComputingGroup/saluki"
20+
"Bug Reports" = "https://github.com/ISISComputingGroup/saluki/issues"
21+
"Source" = "https://github.com/ISISComputingGroup/saluki"
2222

2323
[project.optional-dependencies]
2424
dev = [

0 commit comments

Comments
 (0)