bump version 2.0.17

update and fix badges
2024-06-12 10:33:51 +02:00 · 2024-06-12 10:22:53 +02:00 · 2024-06-12 10:16:56 +02:00 · 2024-06-12 10:15:23 +02:00 · 2024-06-12 10:14:51 +02:00 · 2024-06-12 10:08:33 +02:00
4 changed files with 32 additions and 25 deletions
--- a/.github/workflows/pypi-deploy.yml
+++ b/.github/workflows/pypi-deploy.yml
@@ -1,9 +1,9 @@

-name: Build Python Wheels
+name: CI Build Wheel

 on:
  push:
-    #branches: [master]
+    # branches: [master]
    tags: ["v[0-9]+.[0-9]+.[0-9]+"]

 jobs:
--- a/README.md
+++ b/README.md
@@ -1,10 +1,8 @@

-[![Total alerts](https://img.shields.io/lgtm/alerts/g/RecordEvolution/IMCtermite.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/RecordEvolution/IMCtermite/alerts/)
-[![Language grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/RecordEvolution/IMCtermite.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/RecordEvolution/IMCtermite/context:cpp)
-[![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/RecordEvolution/IMCtermite.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/RecordEvolution/IMCtermite/context:python)
 [![LICENSE](https://img.shields.io/github/license/RecordEvolution/IMCtermite)](https://img.shields.io/github/license/RecordEvolution/IMCtermite)
 [![STARS](https://img.shields.io/github/stars/RecordEvolution/IMCtermite)](https://img.shields.io/github/stars/RecordEvolution/IMCtermite)
-![Build Python Wheels](https://github.com/RecordEvolution/IMCtermite/actions/workflows/pypi-deploy.yml/badge.svg)
+![CI Build Wheel](https://github.com/RecordEvolution/IMCtermite/actions/workflows/pypi-deploy.yml/badge.svg?branch=master&event=push)
+[![PYPI](https://img.shields.io/pypi/v/IMCtermite.svg)](https://pypi.org/project/IMCtermite/)

 # IMCtermite

--- a/lib/imc_channel.hpp
+++ b/lib/imc_channel.hpp
@@ -12,6 +12,8 @@
 #include <time.h>
 #if defined(__linux__) || defined(__APPLE__)
 #include <iconv.h>
+#elif defined(__WIN32__) || defined(_WIN32)
+#define timegm _mkgmtime
 #endif

 //---------------------------------------------------------------------------//
@@ -494,28 +496,35 @@ namespace imc
    // convert any description, units etc. to UTF-8 (by default)
    void convert_encoding()
    {
+      // actual input codepage
+      std::string cpn;
+
      if ( !codepage_.empty() )
      {
        // construct iconv-compatible name for respective codepage
-        std::string cpn = std::string("CP") + codepage_;
-
-        // set up converter
-        std::string utf = std::string("UTF-8");
-        iconverter conv(cpn,utf);
-
-        conv.convert(name_);
-        conv.convert(comment_);
-        conv.convert(origin_);
-        conv.convert(origin_comment_);
-        conv.convert(text_);
-        conv.convert(language_code_);
-        conv.convert(yname_);
-        conv.convert(yunit_);
-        conv.convert(xname_);
-        conv.convert(xunit_);
-        conv.convert(group_name_);
-        conv.convert(group_comment_);
+        cpn = std::string("CP") + codepage_;
      }
+      else {
+	// assume codepage 1252 by default
+	cpn = std::string("CP1252");
+      }
+
+      // set up converter
+      std::string utf = std::string("UTF-8");
+      iconverter conv(cpn,utf);
+
+      conv.convert(name_);
+      conv.convert(comment_);
+      conv.convert(origin_);
+      conv.convert(origin_comment_);
+      conv.convert(text_);
+      conv.convert(language_code_);
+      conv.convert(yname_);
+      conv.convert(yunit_);
+      conv.convert(xname_);
+      conv.convert(xunit_);
+      conv.convert(group_name_);
+      conv.convert(group_comment_);
    }

    // get info string
--- a/python/VERSION
+++ b/python/VERSION
@@ -1 +1 @@
-2.0.15
+2.0.17
Author	SHA1	Message	Date
Mario Fink	b58efae107	bump version 2.0.17	2024-06-12 10:33:51 +02:00
Mario Fink	cc0dd9978f	update and fix badges	2024-06-12 10:22:53 +02:00
Mario Fink	4834f63a67	update and fix badges	2024-06-12 10:16:56 +02:00
Mario Fink	1be78a2c5e	Revert "update and fix badges" This reverts commit `f5581557bc`.	2024-06-12 10:15:23 +02:00
Mario Fink	f5581557bc	update and fix badges	2024-06-12 10:14:51 +02:00
Mario Fink	8cde88848b	update and fix badges	2024-06-12 10:08:33 +02:00
Mario Fink	0799513ea2	by default use codepage1252 for metadata including non-ascii characters while missing codepage info	2024-06-12 09:45:30 +02:00
Mario Fink	effeee105c	win32: replace timegm by _mkgmtime, bump version 2.0.15	2023-08-08 23:46:10 +02:00
@@ -1 +1 @@
 .0.15
 .0.17