From 04dd137898b3ab8cb5e02c8d1569d5758c2ee6b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20J=C3=B6rdens?= Date: Thu, 17 Oct 2024 10:32:11 +0200 Subject: [PATCH 1/3] release 0.16.2 changelog and bumps --- CHANGELOG.md | 6 ++++++ miniconf/Cargo.toml | 2 +- miniconf_mqtt/Cargo.toml | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b8d8528..a821c0cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.16.2](https://github.com/quartiq/miniconf/compare/v0.16.1...v0.16.2) - 2024-10-17 + +### Added + +* `Indices`/`Path` usability improvements avoiding needless borrowing + ## [0.16.1](https://github.com/quartiq/miniconf/compare/v0.16.0...v0.16.1) - 2024-10-15 ### Added diff --git a/miniconf/Cargo.toml b/miniconf/Cargo.toml index 229de70c..e1ff01c7 100644 --- a/miniconf/Cargo.toml +++ b/miniconf/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "miniconf" # Sync all crate versions and the py client -version = "0.16.1" +version = "0.16.2" authors = [ "James Irwin ", "Ryan Summers ", diff --git a/miniconf_mqtt/Cargo.toml b/miniconf_mqtt/Cargo.toml index 1c6ed772..9ad0c825 100644 --- a/miniconf_mqtt/Cargo.toml +++ b/miniconf_mqtt/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "miniconf_mqtt" -version = "0.16.0" +version = "0.16.2" authors = ["James Irwin ", "Ryan Summers ", "Robert Jördens "] edition = "2021" license = "MIT" @@ -12,7 +12,7 @@ categories = ["no-std", "config", "rust-patterns", "parsing"] [lib] [dependencies] -miniconf = { version = "0.16.0", features = ["json-core"], default-features = false, path = "../miniconf" } +miniconf = { version = "0.16.2", features = ["json-core"], default-features = false, path = "../miniconf" } minimq = "0.9.0" smlang = "0.8" embedded-io = "0.6" From ac624312005e1b2911dd63a28ffad2c73594ca7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20J=C3=B6rdens?= Date: Thu, 17 Oct 2024 11:23:42 +0200 Subject: [PATCH 2/3] flake: add [wip] --- flake.nix | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 flake.nix diff --git a/flake.nix b/flake.nix new file mode 100644 index 00000000..3086b4c6 --- /dev/null +++ b/flake.nix @@ -0,0 +1,45 @@ +{ + description = "Miniconf"; + inputs.nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + outputs = { self, nixpkgs }: + let + pkgs = import nixpkgs { system = "x86_64-linux"; }; + aiomqtt22 = pkgs.python3Packages.aiomqtt.overrideAttrs rec { + version = "2.2.0"; + src = pkgs.fetchFromGitHub { + owner = "sbtinstruments"; + repo = "aiomqtt"; + rev = "refs/tags/v${version}"; + hash = "sha256-Sn9wGN93g61tPxuUZbGuElBXqnMEzJilfl3uvnKdIG0="; + }; + propagatedBuildInputs = [ + pkgs.python3Packages.paho-mqtt_2 + pkgs.python3Packages.typing-extensions + ]; + }; + miniconf-mqtt-py = pkgs.python3Packages.buildPythonPackage { + pname = "miniconf"; + version = "0.16.0"; + src = self + "/py/miniconf-mqtt"; + format = "pyproject"; + buildInputs = [ + pkgs.python3Packages.setuptools + ]; + propagatedBuildInputs = [ + # pkgs.python3Packages.aiomqtt + aiomqtt22 + pkgs.python3Packages.typing-extensions + ]; + # checkPhase = "python -m miniconf"; + }; + in { + packages.x86_64-linux = { + inherit miniconf-mqtt-py aiomqtt22; + default = miniconf-mqtt-py; + }; + devShells.x86_64-linux.default = pkgs.mkShellNoCC { + name = "miniconf-dev-shell"; + buildInputs = (pkgs.python3.withPackages(ps: with ps; [ miniconf-mqtt-py ])) + }; + }; +} From 08ee095feb801abb46dd7015be0daf1cdd41a678 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20J=C3=B6rdens?= Date: Thu, 17 Oct 2024 09:37:19 +0000 Subject: [PATCH 3/3] flake: finish --- flake.lock | 27 +++++++++++++++++++++++++++ flake.nix | 20 +++++++++++--------- 2 files changed, 38 insertions(+), 9 deletions(-) create mode 100644 flake.lock diff --git a/flake.lock b/flake.lock new file mode 100644 index 00000000..a44ae23f --- /dev/null +++ b/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1728979988, + "narHash": "sha256-GBJRnbFLDg0y7ridWJHAP4Nn7oss50/VNgqoXaf/RVk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "7881fbfd2e3ed1dfa315fca889b2cfd94be39337", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix index 3086b4c6..4f0b343a 100644 --- a/flake.nix +++ b/flake.nix @@ -1,20 +1,21 @@ { description = "Miniconf"; inputs.nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - outputs = { self, nixpkgs }: + outputs = + { self, nixpkgs }: let pkgs = import nixpkgs { system = "x86_64-linux"; }; aiomqtt22 = pkgs.python3Packages.aiomqtt.overrideAttrs rec { version = "2.2.0"; src = pkgs.fetchFromGitHub { - owner = "sbtinstruments"; - repo = "aiomqtt"; - rev = "refs/tags/v${version}"; - hash = "sha256-Sn9wGN93g61tPxuUZbGuElBXqnMEzJilfl3uvnKdIG0="; + owner = "sbtinstruments"; + repo = "aiomqtt"; + rev = "refs/tags/v${version}"; + hash = "sha256-Sn9wGN93g61tPxuUZbGuElBXqnMEzJilfl3uvnKdIG0="; }; propagatedBuildInputs = [ - pkgs.python3Packages.paho-mqtt_2 - pkgs.python3Packages.typing-extensions + pkgs.python3Packages.paho-mqtt_2 + pkgs.python3Packages.typing-extensions ]; }; miniconf-mqtt-py = pkgs.python3Packages.buildPythonPackage { @@ -32,14 +33,15 @@ ]; # checkPhase = "python -m miniconf"; }; - in { + in + { packages.x86_64-linux = { inherit miniconf-mqtt-py aiomqtt22; default = miniconf-mqtt-py; }; devShells.x86_64-linux.default = pkgs.mkShellNoCC { name = "miniconf-dev-shell"; - buildInputs = (pkgs.python3.withPackages(ps: with ps; [ miniconf-mqtt-py ])) + packages = [ miniconf-mqtt-py ]; }; }; }