Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nanopb/nanopb.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--conanfile.py2
-rw-r--r--extra/poetry/pyproject.toml2
-rwxr-xr-xgenerator/nanopb_generator.py2
-rw-r--r--library.json2
-rw-r--r--pb.h2
-rw-r--r--tests/docker_images/ubuntu1804/Dockerfile2
7 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c11a076..31c86e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.12)
project(nanopb C)
-set(nanopb_VERSION_STRING nanopb-0.4.2-dev)
+set(nanopb_VERSION_STRING nanopb-0.4.2)
set(nanopb_SOVERSION 0)
string(REPLACE "nanopb-" "" nanopb_VERSION ${nanopb_VERSION_STRING})
diff --git a/conanfile.py b/conanfile.py
index 8283261..c1683ec 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -3,7 +3,7 @@ from os import path
class NanoPbConan(ConanFile):
name = "nanopb"
- version = "0.4.2-dev"
+ version = "0.4.2"
license = "zlib"
url = "https://jpa.kapsi.fi/nanopb/"
description = "Protocol Buffers with small code size"
diff --git a/extra/poetry/pyproject.toml b/extra/poetry/pyproject.toml
index 2841ec2..75d0d47 100644
--- a/extra/poetry/pyproject.toml
+++ b/extra/poetry/pyproject.toml
@@ -1,6 +1,6 @@
[tool.poetry]
name = "nanopb"
-version = "0.4.2-dev"
+version = "0.4.2"
description = "Nanopb is a small code-size Protocol Buffers implementation in ansi C. It is especially suitable for use in microcontrollers, but fits any memory restricted system."
authors = ["Petteri Aimonen <jpa@npb.mail.kapsi.fi>"]
license = "Zlib"
diff --git a/generator/nanopb_generator.py b/generator/nanopb_generator.py
index bf0e815..da878eb 100755
--- a/generator/nanopb_generator.py
+++ b/generator/nanopb_generator.py
@@ -4,7 +4,7 @@
from __future__ import unicode_literals
'''Generate header file for nanopb from a ProtoBuf FileDescriptorSet.'''
-nanopb_version = "nanopb-0.4.2-dev"
+nanopb_version = "nanopb-0.4.2"
import sys
import re
diff --git a/library.json b/library.json
index f447490..8fca31a 100644
--- a/library.json
+++ b/library.json
@@ -1,6 +1,6 @@
{
"name": "Nanopb",
- "version": "0.4.1",
+ "version": "0.4.2",
"keywords": "protocol buffers, protobuf, google",
"description": "Nanopb is a plain-C implementation of Google's Protocol Buffers data format. It is targeted at 32 bit microcontrollers, but is also fit for other embedded systems with tight (<10 kB ROM, <1 kB RAM) memory constraints.",
"repository": {
diff --git a/pb.h b/pb.h
index c52a5bb..65787c7 100644
--- a/pb.h
+++ b/pb.h
@@ -55,7 +55,7 @@
/* Version of the nanopb library. Just in case you want to check it in
* your own program. */
-#define NANOPB_VERSION nanopb-0.4.2-dev
+#define NANOPB_VERSION nanopb-0.4.2
/* Include all the system headers needed by nanopb. You will need the
* definitions of the following:
diff --git a/tests/docker_images/ubuntu1804/Dockerfile b/tests/docker_images/ubuntu1804/Dockerfile
index 27efc49..97e512a 100644
--- a/tests/docker_images/ubuntu1804/Dockerfile
+++ b/tests/docker_images/ubuntu1804/Dockerfile
@@ -8,7 +8,7 @@ RUN apt -y install --fix-missing
RUN apt -y install apt-utils
RUN apt -y install git scons build-essential g++
-RUN apt -y install protobuf-compiler python python-protobuf
+RUN apt -y install protobuf-compiler python3-protobuf python3
RUN git clone https://github.com/nanopb/nanopb.git
RUN cd nanopb/tests && scons