Hello community,
here is the log from the commit of package votca-tools for openSUSE:Factory
checked in at 2020-12-10 18:19:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/votca-tools (Old)
and /work/SRC/openSUSE:Factory/.votca-tools.new.2328 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "votca-tools"
Thu Dec 10 18:19:55 2020 rev:17 rq:854603 version:1.6.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/votca-tools/votca-tools.changes 2020-08-25
09:37:39.408172272 +0200
+++ /work/SRC/openSUSE:Factory/.votca-tools.new.2328/votca-tools.changes
2020-12-10 18:19:57.347092597 +0100
@@ -1,0 +2,9 @@
+Wed Dec 9 20:16:43 UTC 2020 - Christoph Junghans <jungh...@votca.org>
+
+- Update to 1.6.3
+ - switch to ghcr.io for CI ([gh#votca/tools#297])
+ - use master .clang-format in format action
+ ([gh#votca/tools#304], [gh#votca/tools#307])
+ - strip windows line endings in readers ([gh#votca/tools#309])
+
+-------------------------------------------------------------------
Old:
----
votca-tools-1.6.2.tar.gz
New:
----
votca-tools-1.6.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ votca-tools.spec ++++++
--- /var/tmp/diff_new_pack.JlltfD/_old 2020-12-10 18:19:57.947094105 +0100
+++ /var/tmp/diff_new_pack.JlltfD/_new 2020-12-10 18:19:57.947094105 +0100
@@ -18,7 +18,7 @@
Name: votca-tools
-Version: 1.6.2
+Version: 1.6.3
Release: 0
%define uversion %{version}
%define sover 6
++++++ votca-tools-1.6.2.tar.gz -> votca-tools-1.6.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/tools-1.6.2/.github/workflows/continuous-integration-workflow.yml
new/tools-1.6.3/.github/workflows/continuous-integration-workflow.yml
--- old/tools-1.6.2/.github/workflows/continuous-integration-workflow.yml
2020-08-22 15:31:14.000000000 +0200
+++ new/tools-1.6.3/.github/workflows/continuous-integration-workflow.yml
2020-12-09 04:54:01.000000000 +0100
@@ -7,10 +7,10 @@
jobs:
CI:
- continue-on-error: ${{ matrix.distro == 'ubuntu_devel' || matrix.distro ==
'fedora_rawhide' || matrix.continue-on-error == true }}
+ continue-on-error: ${{ matrix.distro == 'ubuntu:devel' || matrix.distro ==
'opensuse:latest' || matrix.distro == 'fedora:rawhide' ||
matrix.continue-on-error == true }}
strategy:
matrix:
- distro: [latest, fedora_rawhide, opensuse, ubuntu, ubuntu_devel,
ubuntu_rolling, ubuntu_18.04, intel]
+ distro: ['fedora:latest', 'fedora:rawhide', 'opensuse:latest',
'ubuntu:latest', 'ubuntu:devel', 'ubuntu:rolling', 'ubuntu:18.04',
'fedora:intel']
toolchain: [gnu, clang]
cmake_build_type: [Release, Debug]
minimal: [false]
@@ -18,24 +18,24 @@
module_build: [false]
coverage: [false]
include:
- - distro: fedora_nogmx
+ - distro: 'fedora:nogmx'
toolchain: gnu
cmake_build_type: Release
minimal: true
- - distro: fedora_nogmx
+ - distro: 'fedora:nogmx'
toolchain: clang
cmake_build_type: Release
minimal: true
- - distro: latest
+ - distro: 'fedora:latest'
toolchain: gnu
cmake_build_type: Release
module_build: true
- - distro: intel
+ - distro: 'fedora:intel'
toolchain: gnu
cmake_build_type: Release
module_build: true
runs-on: ubuntu-latest
- container: votca/buildenv:${{ matrix.distro }}
+ container: ghcr.io/votca/buildenv/${{ matrix.distro }}
steps:
- uses: actions/checkout@v2.2.0
with:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tools-1.6.2/.github/workflows/format.yml
new/tools-1.6.3/.github/workflows/format.yml
--- old/tools-1.6.2/.github/workflows/format.yml 2020-08-22
15:31:14.000000000 +0200
+++ new/tools-1.6.3/.github/workflows/format.yml 2020-12-09
04:54:01.000000000 +0100
@@ -7,7 +7,7 @@
name: clang-format
if: ${{ github.event.comment.body == '@votca-bot format' }}
runs-on: ubuntu-latest
- container: votca/buildenv:format
+ container: ghcr.io/votca/buildenv/format:latest
steps:
- name: Check if message comes from PR
uses: octokit/request-action@v2.x
@@ -35,7 +35,9 @@
token: ${{ secrets.VOTCA_BOT_TOKEN }}
- name: Run clang-format
if: ${{ fromJSON(steps.issue_info.outputs.data).pull_request }}
- run: find . -type f -regex ".*\.\(c\|h\|cc\|cpp\|hpp\)" -print0 |
xargs -0 clang-format -i -style=file
+ run: |
+ curl -OL https://github.com/votca/votca/raw/master/.clang-format
+ find . -type f -regex ".*\.\(c\|h\|cc\|cpp\|hpp\)" -print0 | xargs
-0 clang-format -i -style=file
- name: Commit and push
if: ${{ fromJSON(steps.issue_info.outputs.data).pull_request }}
run: |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tools-1.6.2/CHANGELOG.md new/tools-1.6.3/CHANGELOG.md
--- old/tools-1.6.2/CHANGELOG.md 2020-08-22 15:31:14.000000000 +0200
+++ new/tools-1.6.3/CHANGELOG.md 2020-12-09 04:54:01.000000000 +0100
@@ -1,6 +1,11 @@
For more detailed information about the changes see the history of the
[repository](https://github.com/votca/tools/commits/stable).
-## Version 1.6.2 (released 22.08.20)
+## Version 1.6.3 (released 09.12.20)
+* switch to ghcr.io for CI (#297)
+* use master .clang-format in format action (#304, #307)
+* strip windows line endings in readers (#309)
+
+## Version 1.6.2 _SuperGitta_ (released 22.08.20)
* format code with clang-10 (#278)
* move CI to GitHub Actions (#280, #285, #287)
* fix build with mkl (#283)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tools-1.6.2/CMakeLists.txt
new/tools-1.6.3/CMakeLists.txt
--- old/tools-1.6.2/CMakeLists.txt 2020-08-22 15:31:14.000000000 +0200
+++ new/tools-1.6.3/CMakeLists.txt 2020-12-09 04:54:01.000000000 +0100
@@ -2,7 +2,7 @@
project(votca-tools)
-set(PROJECT_VERSION "1.6.2")
+set(PROJECT_VERSION "1.6.3")
string(REGEX REPLACE "^[1-9]+\\.([1-9]+).*$" "\\1" SOVERSION
"${PROJECT_VERSION}")
if (NOT ${SOVERSION} MATCHES "[1-9]+")
message(FATAL_ERROR "Could not determind SOVERSION from ${PROJECT_VERSION}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tools-1.6.2/include/votca/tools/getline.h
new/tools-1.6.3/include/votca/tools/getline.h
--- old/tools-1.6.2/include/votca/tools/getline.h 2020-08-22
15:31:14.000000000 +0200
+++ new/tools-1.6.3/include/votca/tools/getline.h 2020-12-09
04:54:01.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2019 The VOTCA Development Team (http://www.votca.org)
+ * Copyright 2009-2020 The VOTCA Development Team (http://www.votca.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
*/
inline std::istream& getline(std::istream& is, std::string& str) {
- std::istream& ist = getline(is, str, '\n');
+ std::istream& ist = std::getline(is, str, '\n');
str.erase(remove(str.begin(), str.end(), '\r'), str.end());
return ist;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tools-1.6.2/src/libtools/property.cc
new/tools-1.6.3/src/libtools/property.cc
--- old/tools-1.6.2/src/libtools/property.cc 2020-08-22 15:31:14.000000000
+0200
+++ new/tools-1.6.3/src/libtools/property.cc 2020-12-09 04:54:01.000000000
+0100
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2019 The VOTCA Development Team (http://www.votca.org)
+ * Copyright 2009-2020 The VOTCA Development Team (http://www.votca.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -175,7 +175,7 @@
XML_SetUserData(parser, (void *)&pstack);
while (!fl.eof()) {
string line;
- getline(fl, line);
+ tools::getline(fl, line);
line = line + "\n";
if (line.length() > (size_t)std::numeric_limits<int>::max()) {
throw std::runtime_error("Property::LoadFromXML: line is too long");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tools-1.6.2/src/libtools/table.cc
new/tools-1.6.3/src/libtools/table.cc
--- old/tools-1.6.2/src/libtools/table.cc 2020-08-22 15:31:14.000000000
+0200
+++ new/tools-1.6.3/src/libtools/table.cc 2020-12-09 04:54:01.000000000
+0100
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2019 The VOTCA Development Team (http://www.votca.org)
+ * Copyright 2009-2020 The VOTCA Development Team (http://www.votca.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -94,7 +94,7 @@
t.clear();
// read till the first data line
- while (getline(in, line)) {
+ while (tools::getline(in, line)) {
line_number++;
string conversion_error = t.getErrorDetails() + ", line " +
boost::lexical_cast<string>(line_number);
@@ -133,7 +133,7 @@
}
// read the rest
- while (getline(in, line)) {
+ while (tools::getline(in, line)) {
line_number++;
string conversion_error = t.getErrorDetails() + ", line " +
boost::lexical_cast<string>(line_number);
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
