Hello community, here is the log from the commit of package votca-tools for openSUSE:Factory checked in at 2019-11-30 10:37:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/votca-tools (Old) and /work/SRC/openSUSE:Factory/.votca-tools.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "votca-tools" Sat Nov 30 10:37:03 2019 rev:13 rq:750178 version:1.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/votca-tools/votca-tools.changes 2019-09-26 20:41:43.094464866 +0200 +++ /work/SRC/openSUSE:Factory/.votca-tools.new.26869/votca-tools.changes 2019-11-30 10:37:54.600168379 +0100 @@ -1,0 +2,8 @@ +Thu Nov 21 14:52:47 UTC 2019 - Christoph Junghans <[email protected]> + +- Upgrade to 1.5.1 + * switch votca_compare to python3 + * more clear error message for xmlreader + * fix build on CentOs7 + +------------------------------------------------------------------- Old: ---- votca-tools-1.5.tar.gz New: ---- votca-tools-1.5.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ votca-tools.spec ++++++ --- /var/tmp/diff_new_pack.FRA9UH/_old 2019-11-30 10:37:55.592168261 +0100 +++ /var/tmp/diff_new_pack.FRA9UH/_new 2019-11-30 10:37:55.596168260 +0100 @@ -21,7 +21,7 @@ # Name: votca-tools -Version: 1.5 +Version: 1.5.1 %define uversion %{version} %define sover 5 Release: 0 ++++++ votca-tools-1.5.tar.gz -> votca-tools-1.5.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tools-1.5/.gitlab-ci.yml new/tools-1.5.1/.gitlab-ci.yml --- old/tools-1.5/.gitlab-ci.yml 2019-01-31 15:48:11.000000000 +0100 +++ new/tools-1.5.1/.gitlab-ci.yml 2019-11-21 03:36:58.000000000 +0100 @@ -11,6 +11,11 @@ DISTRO: "latest" image: votca/buildenv:${DISTRO} stage: build + artifacts: + paths: + - ${CI_PROJECT_DIR}/votca + when: always + dependencies: [] cache: paths: - ccache/ @@ -18,19 +23,21 @@ - ccache -z - j="$(grep -c processor /proc/cpuinfo 2>/dev/null)" || j=0; ((j++)) - git branch commit_of_build_${CI_BUILD_ID} ${CI_COMMIT_SHA} - - cd $HOME - - git clone --recursive https://github.com/votca/votca + - git clone https://github.com/votca/votca - pushd votca - - if [[ ( ${CI_COMMIT_REF_NAME} =~ ^for/([^/]*)/.* || ${CI_COMMIT_REF_NAME} =~ ^(stable)$ ) && ${BASH_REMATCH[1]} != master ]]; then - git checkout -b ${BASH_REMATCH[1]} origin/${BASH_REMATCH[1]} && git submodule update --recursive --init; + - if [[ ${CI_COMMIT_TAG} = v[12].[0-9]* ]]; then + git checkout -b ${CI_COMMIT_TAG} ${CI_COMMIT_TAG}; + elif [[ ( ${CI_COMMIT_REF_NAME} =~ ^for/([^/]*)/.* || ${CI_COMMIT_REF_NAME} =~ ^(stable)$ ) && ${BASH_REMATCH[1]} != master ]]; then + git checkout -b ${BASH_REMATCH[1]} origin/${BASH_REMATCH[1]}; fi + - git submodule update --recursive --init - git -C ${CI_PROJECT_NAME} fetch ${CI_PROJECT_DIR} commit_of_build_${CI_BUILD_ID} - git -C ${CI_PROJECT_DIR} branch -d commit_of_build_${CI_BUILD_ID} - git -C ${CI_PROJECT_NAME} checkout -f ${CI_COMMIT_SHA} - mkdir -p build - pushd build - cmake .. -DENABLE_TESTING=ON -DBUILD_CSGAPPS=ON -DBUILD_XTP=ON -DBUILD_CTP=ON -DBUILD_CTP_MANUAL=ON -DBUILD_CSG_MANUAL=ON -DBUILD_XTP_MANUAL=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - -DMODULE_BUILD=${MODULE_BUILD} ${MODULE_BUILD:+-DCMAKE_INSTALL_PREFIX=/home/votca/votca.install} + -DMODULE_BUILD=${MODULE_BUILD} ${MODULE_BUILD:+-DCMAKE_INSTALL_PREFIX=/home/votca/votca.install -DBUILD_XTP_MANUAL=OFF} ${MINIMAL:+-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=ON -DWITH_FFTW=OFF -DWITH_GSL=OFF -DCMAKE_DISABLE_FIND_PACKAGE_GSL=ON -DWITH_MKL=OFF -DCMAKE_DISABLE_FIND_PACKAGE_MKL=ON -DBUILD_MANPAGES=OFF -DWITH_GMX=OFF -DWITH_SQLITE3=OFF -DCMAKE_DISABLE_FIND_PACKAGE_SQLITE3=ON -DBUILD_XTP=OFF -DBUILD_CTP=OFF} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tools-1.5/CHANGELOG.md new/tools-1.5.1/CHANGELOG.md --- old/tools-1.5/CHANGELOG.md 2019-01-31 15:48:11.000000000 +0100 +++ new/tools-1.5.1/CHANGELOG.md 2019-11-21 03:36:58.000000000 +0100 @@ -1,5 +1,11 @@ For more detailed information about the changes see the history of the [repository](https://github.com/votca/tools/commits/stable). +## Version 1.5.1 (released 20.11.19) + * switch votca_compare to python3 + * more clear error message for xmlreader + * fix build on CentOs7 + + ## Version 1.5 _SuperVictor_ (released 31.01.19) * enable gitlab CI diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tools-1.5/CMakeLists.txt new/tools-1.5.1/CMakeLists.txt --- old/tools-1.5/CMakeLists.txt 2019-01-31 15:48:11.000000000 +0100 +++ new/tools-1.5.1/CMakeLists.txt 2019-11-21 03:36:58.000000000 +0100 @@ -2,7 +2,7 @@ project(votca-tools) -set(PROJECT_VERSION "1.5") +set(PROJECT_VERSION "1.5.1") 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}") @@ -60,7 +60,7 @@ find_package(Threads REQUIRED) set(THREAD_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) -find_package(Boost 1.57.0 REQUIRED COMPONENTS program_options filesystem system ) +find_package(Boost 1.53.0 REQUIRED COMPONENTS program_options filesystem system ) include_directories(${Boost_INCLUDE_DIRS}) set (BOOST_CFLAGS_PKG "-I${Boost_INCLUDE_DIRS}") set(BOOST_LIBS_PKG "-L${Boost_LIBRARY_DIRS}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tools-1.5/include/votca/tools/graph.h new/tools-1.5.1/include/votca/tools/graph.h --- old/tools-1.5/include/votca/tools/graph.h 2019-01-31 15:48:11.000000000 +0100 +++ new/tools-1.5.1/include/votca/tools/graph.h 2019-11-21 03:36:58.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 2009-2018 The VOTCA Development Team + * Copyright 2009-2019 The VOTCA Development Team * (http://www.votca.org) * * Licensed under the Apache License, Version 2.0 (the "License") @@ -32,7 +32,7 @@ namespace tools { /** - * \brief A graph object that contains the graph nodes and the edges describing + * \brief A graph object that contains the graph nodes and the edges describing * the bonds between nodes. * */ @@ -124,8 +124,8 @@ * * sort(vec_pr_gn.begin(),vec_pr_gn.end(),cmpVertNodePair); */ -bool cmpVertNodePair(std::pair<int, GraphNode> gn1_pr, - std::pair<int, GraphNode> gn2_pr); -} -} +bool cmpVertNodePair(const std::pair<int, GraphNode>& gn1_pr, + const std::pair<int, GraphNode>& gn2_pr); +} // namespace tools +} // namespace votca #endif // _VOTCA_TOOLS_GRAPH_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tools-1.5/include/votca/tools/property.h new/tools-1.5.1/include/votca/tools/property.h --- old/tools-1.5/include/votca/tools/property.h 2019-01-31 15:48:11.000000000 +0100 +++ new/tools-1.5.1/include/votca/tools/property.h 2019-11-21 03:36:58.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 2009-2018 The VOTCA Development Team (http://www.votca.org) + * Copyright 2009-2019 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. @@ -375,6 +375,7 @@ if (it != _attributes.end()) { return lexical_cast<T>((*it).second); } else { + std::cerr << *this << std::endl; throw std::runtime_error("attribute " + (*it).first + " not found\n"); } } @@ -389,6 +390,7 @@ if (it != _attributes.end()) { return lexical_cast<T>(_attributes[attribute], "wrong type in attribute " + attribute + " of element " + _path + "." + _name + "\n"); } else { + std::cerr << *this << std::endl; throw std::runtime_error("attribute " + attribute + " not found\n"); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tools-1.5/include/votca/tools/vec.h new/tools-1.5.1/include/votca/tools/vec.h --- old/tools-1.5/include/votca/tools/vec.h 2019-01-31 15:48:11.000000000 +0100 +++ new/tools-1.5.1/include/votca/tools/vec.h 2019-11-21 03:36:58.000000000 +0100 @@ -171,9 +171,9 @@ throw std::runtime_error("\n\n\t error, string to vec, size!=3\n\n"); } try { - _x = boost::lexical_cast<double>(values[0]); - _y = boost::lexical_cast<double>(values[1]); - _z = boost::lexical_cast<double>(values[2]); + _x = std::stod(values[0]); + _y = std::stod(values[1]); + _z = std::stod(values[2]); } catch(const boost::bad_lexical_cast& e) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tools-1.5/scripts/votca_compare.in new/tools-1.5.1/scripts/votca_compare.in --- old/tools-1.5/scripts/votca_compare.in 2019-01-31 15:48:11.000000000 +0100 +++ new/tools-1.5.1/scripts/votca_compare.in 2019-11-21 03:36:58.000000000 +0100 @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # # Copyright 2009-2018 The VOTCA Development Team (http://www.votca.org) # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tools-1.5/src/libtools/graph.cc new/tools-1.5.1/src/libtools/graph.cc --- old/tools-1.5/src/libtools/graph.cc 2019-01-31 15:48:11.000000000 +0100 +++ new/tools-1.5.1/src/libtools/graph.cc 2019-11-21 03:36:58.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 2009-2018 The VOTCA Development Team + * Copyright 2009-2019 The VOTCA Development Team * (http://www.votca.org) * * Licensed under the Apache License, Version 2.0 (the "License") @@ -83,18 +83,18 @@ return missing; } -vector<pair<int,GraphNode>> Graph::getNeighNodes(int vert){ +vector<pair<int, GraphNode>> Graph::getNeighNodes(int vert) { auto neigh_vertices = getNeighVertices(vert); - vector<pair<int,GraphNode>> neigh_vertices_pr; - for(auto neigh_vert : neigh_vertices){ - auto node_pr = pair<int,GraphNode>(neigh_vert,nodes_[neigh_vert]); + vector<pair<int, GraphNode>> neigh_vertices_pr; + for (auto neigh_vert : neigh_vertices) { + auto node_pr = pair<int, GraphNode>(neigh_vert, nodes_[neigh_vert]); neigh_vertices_pr.push_back(node_pr); } return neigh_vertices_pr; } -void Graph::setNode(int vert, GraphNode gn){ - if(nodes_.count(vert)){ +void Graph::setNode(int vert, GraphNode gn) { + if (nodes_.count(vert)) { nodes_[vert] = gn; } else { string errMsg = "Vertex does not exist within graph cannot, reset node"; @@ -107,9 +107,9 @@ setNode(p_gn.first, p_gn.second); } -GraphNode Graph::getNode(int vert) { +GraphNode Graph::getNode(int vert) { assert(nodes_.count(vert)); - return nodes_[vert]; + return nodes_[vert]; } vector<pair<int, GraphNode>> Graph::getNodes(void) { @@ -140,9 +140,10 @@ return os; } -bool cmpVertNodePair(pair<int, GraphNode> gn1_pr, pair<int, GraphNode> gn2_pr) { +bool cmpVertNodePair(const pair<int, GraphNode>& gn1_pr, + const pair<int, GraphNode>& gn2_pr) { string str1_Id = gn1_pr.second.getStringId(); return str1_Id.compare(gn2_pr.second.getStringId()) < 0; } -} -} +} // namespace tools +} // namespace votca diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tools-1.5/src/libtools/table.cc new/tools-1.5.1/src/libtools/table.cc --- old/tools-1.5/src/libtools/table.cc 2019-01-31 15:48:11.000000000 +0100 +++ new/tools-1.5.1/src/libtools/table.cc 2019-11-21 03:36:58.000000000 +0100 @@ -121,14 +121,14 @@ bHasN = true; } else if (tokens.size() == 2) { // it's the first data line with 2 or 3 entries - t.push_back(lexical_cast<double>(tokens[0], conversion_error), - lexical_cast<double>(tokens[1], conversion_error), 'i'); + t.push_back(std::stod(tokens[0]), + std::stod(tokens[1]), 'i'); } else if (tokens.size() > 2) { char flag = 'i'; string sflag = tokens.back(); if (sflag == "i" || sflag == "o" || sflag == "u") flag = sflag.c_str()[0]; - t.push_back(lexical_cast<double>(tokens[0], conversion_error), - lexical_cast<double>(tokens[1], conversion_error), flag); + t.push_back(std::stod(tokens[0]), + std::stod(tokens[1]), flag); } else { throw runtime_error("error, wrong table format"); } @@ -154,14 +154,14 @@ // it's a data line if (tokens.size() == 2) { - t.push_back(lexical_cast<double>(tokens[0], conversion_error), - lexical_cast<double>(tokens[1], conversion_error), 'i'); + t.push_back(std::stod(tokens[0]), + std::stod(tokens[1]), 'i'); } else if (tokens.size() > 2) { char flag = 'i'; if (tokens[2] == "i" || tokens[2] == "o" || tokens[2] == "u") flag = tokens[2].c_str()[0]; - t.push_back(lexical_cast<double>(tokens[0], conversion_error), - lexical_cast<double>(tokens[1], conversion_error), flag); + t.push_back(std::stod(tokens[0]), + std::stod(tokens[1]), flag); }else{ // otherwise error throw runtime_error("error, wrong table format"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tools-1.5/src/tests/CMakeLists.txt new/tools-1.5.1/src/tests/CMakeLists.txt --- old/tools-1.5/src/tests/CMakeLists.txt 2019-01-31 15:48:11.000000000 +0100 +++ new/tools-1.5.1/src/tests/CMakeLists.txt 2019-11-21 03:36:58.000000000 +0100 @@ -1,4 +1,4 @@ -find_package(Boost 1.57.0 REQUIRED COMPONENTS unit_test_framework) +find_package(Boost 1.53.0 REQUIRED COMPONENTS unit_test_framework) # Each test listed in Alphabetical order foreach(PROG
