Skip to content

Commit d24724f

Browse files
dostuffthatmattersdostuffthatmatters
committed
Update version number to 4.2.2
1 parent aec14ac commit d24724f

File tree

9 files changed

+141
-157
lines changed

9 files changed

+141
-157
lines changed

‎config/config.default.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"general": {
3-
"version": "4.2.1",
3+
"version": "4.2.2",
44
"seconds_per_core_iteration": 30,
55
"test_mode": false,
66
"station_id": "...",
@@ -61,4 +61,4 @@
6161
"tum_enclosure": null,
6262
"helios": null,
6363
"upload": null
64-
}
64+
}

‎packages/cli/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def print_cli_information() -> None:
2828
logger.debug('running command "info"')
2929
click.echo(
3030
click.style(
31-
f'This CLI is running Pyra version 4.2.1 in directory "{_PROJECT_DIR}"',
31+
f'This CLI is running Pyra version 4.2.2 in directory "{_PROJECT_DIR}"',
3232
fg="green",
3333
)
3434
)

‎packages/core/types/config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class PartialTimeDict(StricterBaseModel):
3333

3434

3535
class GeneralConfig(StricterBaseModel):
36-
version: Literal["4.2.1"]
36+
version: Literal["4.2.2"]
3737
seconds_per_core_iteration: float = pydantic.Field(..., ge=5, le=600)
3838
test_mode: bool
3939
station_id: str
@@ -43,7 +43,7 @@ class GeneralConfig(StricterBaseModel):
4343
class PartialGeneralConfig(StricterBaseModel):
4444
"""Like `GeneralConfig`, but all fields are optional."""
4545

46-
version: Literal["4.2.1"] = "4.2.1"
46+
version: Literal["4.2.2"] = "4.2.2"
4747
seconds_per_core_iteration: Optional[float] = pydantic.Field(None, ge=5, le=600)
4848
test_mode: Optional[bool] = None
4949
station_id: Optional[str] = None

‎packages/ui/.env.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
VITE_PYTHON_INTERPRETER="system|venv"
2-
VITE_PYRA_DIRECTORY="~/Documents/pyra/pyra-4.2.1"
2+
VITE_PYRA_DIRECTORY="~/Documents/pyra/pyra-4.2.2"

‎packages/ui/package.json

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,62 @@
11
{
2-
"name": "pyra-ui",
3-
"version": "4.2.1",
4-
"private": true,
5-
"scripts": {
6-
"dev": "vite --port 3000",
7-
"build": "tsc && vite build",
8-
"preview": "vite preview",
9-
"tauri": "tauri"
10-
},
11-
"dependencies": {
12-
"@radix-ui/react-checkbox": "^1.1.3",
13-
"@radix-ui/react-icons": "^1.3.2",
14-
"@radix-ui/react-select": "^2.1.4",
15-
"@radix-ui/react-separator": "^1.1.1",
16-
"@radix-ui/react-slot": "^1.1.1",
17-
"@reduxjs/toolkit": "^2.5.0",
18-
"@tabler/icons-react": "^3.26.0",
19-
"@tauri-apps/api": "^2.1.1",
20-
"@tauri-apps/plugin-cli": "^2.2.0",
21-
"@tauri-apps/plugin-dialog": "^2.2.0",
22-
"@tauri-apps/plugin-fs": "^2.2.0",
23-
"@tauri-apps/plugin-shell": "^2.2.0",
24-
"class-variance-authority": "^0.7.1",
25-
"clsx": "^2.1.1",
26-
"deep-diff": "^1.0.2",
27-
"lodash": "4.17.21",
28-
"moment": "^2.30.1",
29-
"react": "19.0.0",
30-
"react-dom": "19.0.0",
31-
"react-hot-toast": "^2.4.1",
32-
"recursive-diff": "^1.0.9",
33-
"tailwind-merge": "^2.5.5",
34-
"tailwindcss-animate": "^1.0.7",
35-
"zod": "^3.24.1",
36-
"zustand": "^5.0.2"
37-
},
38-
"devDependencies": {
39-
"@tailwindcss/forms": "0.5.9",
40-
"@tauri-apps/cli": "^2.1.0",
41-
"@types/deep-diff": "^1.0.5",
42-
"@types/lodash": "4.17.13",
43-
"@types/node": "^22.10.2",
44-
"@types/react": "19.0.2",
45-
"@types/react-dom": "19.0.2",
46-
"@vitejs/plugin-react": "4.3.4",
47-
"autoprefixer": "10.4.20",
48-
"postcss": "8.4.49",
49-
"tailwindcss": "3.4.17",
50-
"tilg": "0.1.1",
51-
"typedoc": "^0.27.5",
52-
"typescript": "5.7.2",
53-
"vite": "^6.0.4"
54-
},
55-
"prettier": {
56-
"trailingComma": "es5",
57-
"tabWidth": 4,
58-
"semi": true,
59-
"singleQuote": true,
60-
"printWidth": 100
61-
}
62-
}
2+
"name": "pyra-ui",
3+
"version": "4.2.2",
4+
"private": true,
5+
"scripts": {
6+
"dev": "vite --port 3000",
7+
"build": "tsc && vite build",
8+
"preview": "vite preview",
9+
"tauri": "tauri"
10+
},
11+
"dependencies": {
12+
"@radix-ui/react-checkbox": "^1.1.3",
13+
"@radix-ui/react-icons": "^1.3.2",
14+
"@radix-ui/react-select": "^2.1.4",
15+
"@radix-ui/react-separator": "^1.1.1",
16+
"@radix-ui/react-slot": "^1.1.1",
17+
"@reduxjs/toolkit": "^2.5.0",
18+
"@tabler/icons-react": "^3.26.0",
19+
"@tauri-apps/api": "^2.1.1",
20+
"@tauri-apps/plugin-cli": "^2.2.0",
21+
"@tauri-apps/plugin-dialog": "^2.2.0",
22+
"@tauri-apps/plugin-fs": "^2.2.0",
23+
"@tauri-apps/plugin-shell": "^2.2.0",
24+
"class-variance-authority": "^0.7.1",
25+
"clsx": "^2.1.1",
26+
"deep-diff": "^1.0.2",
27+
"lodash": "4.17.21",
28+
"moment": "^2.30.1",
29+
"react": "19.0.0",
30+
"react-dom": "19.0.0",
31+
"react-hot-toast": "^2.4.1",
32+
"recursive-diff": "^1.0.9",
33+
"tailwind-merge": "^2.5.5",
34+
"tailwindcss-animate": "^1.0.7",
35+
"zod": "^3.24.1",
36+
"zustand": "^5.0.2"
37+
},
38+
"devDependencies": {
39+
"@tailwindcss/forms": "0.5.9",
40+
"@tauri-apps/cli": "^2.1.0",
41+
"@types/deep-diff": "^1.0.5",
42+
"@types/lodash": "4.17.13",
43+
"@types/node": "^22.10.2",
44+
"@types/react": "19.0.2",
45+
"@types/react-dom": "19.0.2",
46+
"@vitejs/plugin-react": "4.3.4",
47+
"autoprefixer": "10.4.20",
48+
"postcss": "8.4.49",
49+
"tailwindcss": "3.4.17",
50+
"tilg": "0.1.1",
51+
"typedoc": "^0.27.5",
52+
"typescript": "5.7.2",
53+
"vite": "^6.0.4"
54+
},
55+
"prettier": {
56+
"trailingComma": "es5",
57+
"tabWidth": 4,
58+
"semi": true,
59+
"singleQuote": true,
60+
"printWidth": 100
61+
}
62+
}

‎packages/ui/src-tauri/Cargo.toml

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
[package]
22
name = "pyra-ui"
3-
version = "4.2.1"
3+
version = "4.2.2"
44
description = "Pyra UI"
5-
authors = [
6-
"Moritz Makowski <moritz.makowski@tum.de>",
7-
]
5+
authors = ["Moritz Makowski <moritz.makowski@tum.de>"]
86
license = ""
97
repository = "https://github.com/tum-esm/pyra"
108
default-run = "pyra-ui"
@@ -14,18 +12,12 @@ rust-version = "1.57"
1412
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1513

1614
[build-dependencies]
17-
tauri-build = { version = "2", features = [
18-
] }
15+
tauri-build = { version = "2", features = [] }
1916

2017
[dependencies]
2118
serde_json = "1.0"
22-
serde = { version = "1.0", features = [
23-
"derive",
24-
] }
25-
tauri = { version = "2", features = [
26-
"protocol-asset",
27-
"devtools",
28-
] }
19+
serde = { version = "1.0", features = ["derive"] }
20+
tauri = { version = "2", features = ["protocol-asset", "devtools"] }
2921
tauri-plugin-shell = "2"
3022
tauri-plugin-fs = "2"
3123
tauri-plugin-dialog = "2"
@@ -36,6 +28,4 @@ tauri-plugin-dialog = "2"
3628
default = ["custom-protocol"]
3729
# this feature is used used for production builds where `devPath` points to the filesystem
3830
# DO NOT remove this
39-
custom-protocol = [
40-
"tauri/custom-protocol",
41-
]
31+
custom-protocol = ["tauri/custom-protocol"]

‎packages/ui/src-tauri/tauri.conf.json

Lines changed: 65 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,70 @@
11
{
2-
"$schema": "../node_modules/@tauri-apps/cli/schema.json",
3-
"build": {
4-
"beforeBuildCommand": "bun run build",
5-
"beforeDevCommand": "bun run dev",
6-
"frontendDist": "../dist",
7-
"devUrl": "http://localhost:3000"
8-
},
9-
"bundle": {
10-
"active": true,
11-
"category": "DeveloperTool",
12-
"copyright": "",
13-
"targets": "all",
14-
"externalBin": [],
15-
"icon": [
16-
"icons/32x32.png",
17-
"icons/128x128.png",
18-
"icons/128x128@2x.png",
19-
"icons/icon.icns",
20-
"icons/icon.ico"
21-
],
22-
"windows": {
23-
"certificateThumbprint": null,
24-
"digestAlgorithm": "sha256",
25-
"timestampUrl": ""
2+
"$schema": "../node_modules/@tauri-apps/cli/schema.json",
3+
"build": {
4+
"beforeBuildCommand": "bun run build",
5+
"beforeDevCommand": "bun run dev",
6+
"frontendDist": "../dist",
7+
"devUrl": "http://localhost:3000"
268
},
27-
"longDescription": "",
28-
"macOS": {
29-
"entitlements": null,
30-
"exceptionDomain": "",
31-
"frameworks": [],
32-
"providerShortName": null,
33-
"signingIdentity": null
9+
"bundle": {
10+
"active": true,
11+
"category": "DeveloperTool",
12+
"copyright": "",
13+
"targets": "all",
14+
"externalBin": [],
15+
"icon": [
16+
"icons/32x32.png",
17+
"icons/128x128.png",
18+
"icons/128x128@2x.png",
19+
"icons/icon.icns",
20+
"icons/icon.ico"
21+
],
22+
"windows": {
23+
"certificateThumbprint": null,
24+
"digestAlgorithm": "sha256",
25+
"timestampUrl": ""
26+
},
27+
"longDescription": "",
28+
"macOS": {
29+
"entitlements": null,
30+
"exceptionDomain": "",
31+
"frameworks": [],
32+
"providerShortName": null,
33+
"signingIdentity": null
34+
},
35+
"resources": [],
36+
"shortDescription": "",
37+
"linux": {
38+
"deb": {
39+
"depends": []
40+
}
41+
}
3442
},
35-
"resources": [],
36-
"shortDescription": "",
37-
"linux": {
38-
"deb": {
39-
"depends": []
40-
}
41-
}
42-
},
43-
"productName": "Pyra UI",
44-
"mainBinaryName": "Pyra UI",
45-
"version": "4.2.1",
46-
"identifier": "pyra-ui",
47-
"plugins": {},
48-
"app": {
49-
"windows": [
50-
{
51-
"fullscreen": false,
52-
"resizable": true,
53-
"title": "Pyra UI",
54-
"height": 620,
55-
"minHeight": 620,
56-
"width": 1000,
57-
"minWidth": 1000,
58-
"center": true,
59-
"useHttpsScheme": true
60-
}
61-
],
62-
"security": {
63-
"assetProtocol": {
64-
"scope": [
65-
"$DOWNLOAD/pyra/**",
66-
"$DOCUMENT/pyra/**",
67-
"$DOCUMENT/work/esm/pyra/**"
43+
"productName": "Pyra UI",
44+
"mainBinaryName": "Pyra UI",
45+
"version": "4.2.2",
46+
"identifier": "pyra-ui",
47+
"plugins": {},
48+
"app": {
49+
"windows": [
50+
{
51+
"fullscreen": false,
52+
"resizable": true,
53+
"title": "Pyra UI",
54+
"height": 620,
55+
"minHeight": 620,
56+
"width": 1000,
57+
"minWidth": 1000,
58+
"center": true,
59+
"useHttpsScheme": true
60+
}
6861
],
69-
"enable": true
70-
},
71-
"csp": null
62+
"security": {
63+
"assetProtocol": {
64+
"scope": ["$DOWNLOAD/pyra/**", "$DOCUMENT/pyra/**", "$DOCUMENT/work/esm/pyra/**"],
65+
"enable": true
66+
},
67+
"csp": null
68+
}
7269
}
73-
}
74-
}
70+
}

‎pyproject.toml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "pyra"
3-
version = "4.2.1"
3+
version = "4.2.2"
44
description = "Automated EM27/SUN Greenhouse Gas Measurements"
55
authors = [
66
{ name = "Moritz Makowski", email = "moritz.makowski@tum.de" },
@@ -57,9 +57,7 @@ exclude = ["tests/*"]
5757
strict = true
5858
implicit_reexport = true
5959
warn_unused_ignores = false
60-
untyped_calls_exclude = [
61-
"skimage",
62-
]
60+
untyped_calls_exclude = ["skimage"]
6361
plugins = ["pydantic.mypy"]
6462

6563
[[tool.mypy.overrides]]

‎tests/fixtures.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
SAMPLE_CONFIG = types.Config(
1111
general=types.config.GeneralConfig(
12-
version="4.2.1",
12+
version="4.2.2",
1313
seconds_per_core_iteration=30,
1414
test_mode=True,
1515
station_id="...",

0 commit comments

Comments
 (0)