Hello community,
here is the log from the commit of package libcomps for openSUSE:Factory
checked in at 2019-12-03 15:21:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libcomps (Old)
and /work/SRC/openSUSE:Factory/.libcomps.new.4691 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcomps"
Tue Dec 3 15:21:57 2019 rev:6 rq:753241 version:0.1.14
Changes:
--------
--- /work/SRC/openSUSE:Factory/libcomps/libcomps.changes 2019-04-01
12:39:50.825957784 +0200
+++ /work/SRC/openSUSE:Factory/.libcomps.new.4691/libcomps.changes
2019-12-03 15:22:03.694515639 +0100
@@ -1,0 +2,24 @@
+Tue Dec 3 13:02:29 UTC 2019 - Neal Gompa <ngomp...@gmail.com>
+
+- Upgrade to 0.1.14
+ + Fix reference to versioned libcomps.so
+
+-------------------------------------------------------------------
+Tue Dec 3 12:42:44 UTC 2019 - Neal Gompa <ngomp...@gmail.com>
+
+- Upgrade to 0.1.13
+ + Fix massively broken libcomps pkgconfig file
+ + Change libcomps soversion to use only the version major
+
+-------------------------------------------------------------------
+Sun Dec 1 15:46:52 UTC 2019 - Neal Gompa <ngomp...@gmail.com>
+
+- Upgrade to 0.1.12
+ + Fix order of asserts() in unit test (rh#1713220)
+ + Fix Python method descriptors for Python 3.8 (rh#1734777)
+ + Refactor pkgconfig file generation and install properly
+ + Fix segfault when converting empty dict to string (rh#1757959)
+ + Add missing python metadata to python3-libcomps
+ + Refactor building and installing Python bindings
+
+-------------------------------------------------------------------
Old:
----
libcomps-0.1.11.tar.gz
New:
----
libcomps-0.1.14.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libcomps.spec ++++++
--- /var/tmp/diff_new_pack.u4vSkn/_old 2019-12-03 15:22:04.702515178 +0100
+++ /var/tmp/diff_new_pack.u4vSkn/_new 2019-12-03 15:22:04.702515178 +0100
@@ -19,8 +19,8 @@
%define major 0
%define minor 1
-%define patch 11
-%define libname %{name}%{major}_%{minor}_%{patch}
+%define patch 14
+%define libname %{name}%{major}
%define devname %{name}-devel
Name: libcomps
@@ -127,11 +127,12 @@
%postun -n %{libname} -p /sbin/ldconfig
%files -n %{libname}
-%{_libdir}/libcomps.so.%{major}.%{minor}.%{patch}
+%{_libdir}/libcomps.so.%{major}
%doc README.md COPYING
%files -n %{devname}
%{_libdir}/libcomps.so
+%{_libdir}/pkgconfig/libcomps.pc
%{_includedir}/*
%files doc
@@ -141,6 +142,7 @@
%doc %{_datadir}/doc/python-libcomps
%files -n python3-libcomps
-%{python3_sitearch}/libcomps
+%{python3_sitearch}/libcomps/
+%{python3_sitearch}/libcomps-*
%changelog
++++++ libcomps-0.1.11.tar.gz -> libcomps-0.1.14.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libcomps-libcomps-0.1.11/.gitignore
new/libcomps-libcomps-0.1.14/.gitignore
--- old/libcomps-libcomps-0.1.11/.gitignore 2019-03-11 08:09:27.000000000
+0100
+++ new/libcomps-libcomps-0.1.14/.gitignore 2019-12-03 14:00:39.000000000
+0100
@@ -18,6 +18,14 @@
lib
lib64
+# Compilation artifacts
+_skbuild/
+
+# Python distribution stuff
+dist/
+MANIFEST
+*.egg-info/
+
# Installer logs
pip-log.txt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libcomps-libcomps-0.1.11/README.md
new/libcomps-libcomps-0.1.14/README.md
--- old/libcomps-libcomps-0.1.11/README.md 2019-03-11 08:09:27.000000000
+0100
+++ new/libcomps-libcomps-0.1.14/README.md 2019-12-03 14:00:39.000000000
+0100
@@ -58,6 +58,29 @@
tito build --rpm --test
+## Building Python package
+To create a binary "wheel" distribution, use:
+
+ python setup.py bdist_wheel
+
+To create a source distribution, use:
+
+ python setup.py sdist
+
+Installing source distributions require the installer of the package to have
all of the build dependencies installed on their system, since they compile the
code during installation. Binary distributions are pre-compiled, but they are
likely not portable between substantially different systems, e.g. Fedora and
Ubuntu.
+
+Note: if you are building a bdist or installing the sdist on a system with an
older version of Pip, you may need to install the ```scikit-build``` Python
package first.
+
+To install either of these packages, use:
+
+ pip install dist/{{ package name }}
+
+To create an "editable" install of libcomps, use:
+
+ python setup.py develop
+
+Note: To recompile the libraries and binaries, you muse re-run this command.
+
### Installing
* After successful build run:
make install
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libcomps-libcomps-0.1.11/build_prep.cmake
new/libcomps-libcomps-0.1.14/build_prep.cmake
--- old/libcomps-libcomps-0.1.11/build_prep.cmake 2019-03-11
08:09:27.000000000 +0100
+++ new/libcomps-libcomps-0.1.14/build_prep.cmake 2019-12-03
14:00:39.000000000 +0100
@@ -168,6 +168,3 @@
set(GITARG archive ${GITREV} "--format=tar.gz"
"--prefix=libcomps-${GITREVLONG}/")
set(GITCMD "git")
execute_process(COMMAND ${GITCMD} ${GITARG} OUTPUT_FILE ${archive_name})
-
-configure_file(libcomps.pc.in libcomps.pc @ONLY)
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libcomps-libcomps-0.1.11/libcomps/CMakeLists.txt
new/libcomps-libcomps-0.1.14/libcomps/CMakeLists.txt
--- old/libcomps-libcomps-0.1.11/libcomps/CMakeLists.txt 2019-03-11
08:09:27.000000000 +0100
+++ new/libcomps-libcomps-0.1.14/libcomps/CMakeLists.txt 2019-12-03
14:00:39.000000000 +0100
@@ -1,12 +1,15 @@
-project(libcomps)
+project(libcomps C)
+cmake_minimum_required (VERSION 2.8.10)
-cmake_minimum_required (VERSION 2.6)
+include (GNUInstallDirs)
include (${CMAKE_ROOT}/Modules/CheckFunctionExists.cmake)
include (${CMAKE_SOURCE_DIR}/version.cmake)
#set (CMAKE_CXX_COMPILER g++)
-set(LIBCOMPS_OUT "${CMAKE_CURRENT_BINARY_DIR}/src")
+OPTION (ENABLE_TESTS "Build test?" ON)
+OPTION (ENABLE_DOCS "Build docs?" ON)
+set(LIBCOMPS_OUT "${CMAKE_CURRENT_BINARY_DIR}/src")
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --pedantic -std=c99 -Wall
-Wextra -g -Wno-missing-field-initializers -O2 -fno-strict-aliasing -g")
set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} -ggdb -O0 -Wall -Wextra")
@@ -15,12 +18,23 @@
#set (libcomps_SOURCE comps_list.c)
#set (libcomps_HEADERS comps_list.h)
+option(BUILD_LIBCOMPS_SHARED "Build libcomps as a shared library?" ON)
+if(NOT BUILD_LIBCOMPS_SHARED)
+ set(CMAKE_POSITION_INDEPENDENT_CODE 1)
+endif()
+
+option(ENABLE_DEVELOPMENT "Install development files?" ON)
+option(ENABLE_DOCS "Build docs?" ON)
+option(ENABLE_TESTS "Build test?" ON)
+
include_directories("${PROJECT_BINARY_DIR}")
include_directories("${PROJECT_SOURCE_DIR}/src")
#include_directories("${PROJECT_SOURCE_DIR}/src/libcomps")
-FIND_LIBRARY(CHECK_LIBRARY NAMES check)
-FIND_LIBRARY(EXPAT_LIBRARY NAMES expat)
+if (ENABLE_TESTS)
+ find_library(CHECK_LIBRARY NAMES check)
+endif()
+find_library(EXPAT_LIBRARY NAMES expat)
find_package(ZLIB REQUIRED)
find_package(LibXml2 REQUIRED)
@@ -38,12 +52,20 @@
# WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/libcomps/
# COMMENT "Running python binding tests")
-add_custom_target(pytest)
-add_custom_target(ctest)
-add_custom_target(test)
-add_dependencies(test ctest)
-add_dependencies(test pytest)
+if (ENABLE_TESTS)
+ add_custom_target(pytest)
+ add_custom_target(ctest)
+ add_custom_target(test)
+ add_dependencies(test ctest)
+ add_dependencies(test pytest)
+endif ()
add_subdirectory (src)
-add_subdirectory (tests)
-add_subdirectory (docs EXCLUDE_FROM_ALL)
+
+if (ENABLE_TESTS)
+ add_subdirectory (tests)
+endif ()
+
+if (ENABLE_DOCS)
+ add_subdirectory (docs EXCLUDE_FROM_ALL)
+endif (ENABLE_DOCS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libcomps-libcomps-0.1.11/libcomps/src/CMakeLists.txt
new/libcomps-libcomps-0.1.14/libcomps/src/CMakeLists.txt
--- old/libcomps-libcomps-0.1.11/libcomps/src/CMakeLists.txt 2019-03-11
08:09:27.000000000 +0100
+++ new/libcomps-libcomps-0.1.14/libcomps/src/CMakeLists.txt 2019-12-03
14:00:39.000000000 +0100
@@ -1,4 +1,3 @@
-include(GNUInstallDirs)
set (libcomps_SOURCES comps_doc.c comps_docgroup.c comps_doccategory.c
comps_docenv.c comps_docpackage.c comps_docgroupid.c
comps_obj.c comps_mm.c
@@ -26,7 +25,6 @@
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-
configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/libcomps_config.h.in"
"${PROJECT_SOURCE_DIR}/src/libcomps/libcomps_config.h")
@@ -41,24 +39,38 @@
endforeach()
-add_library(libcomps SHARED ${libcomps_SOURCES})
+if (BUILD_LIBCOMPS_SHARED)
+ set (libcomps_library_type SHARED)
+else ()
+ set (libcomps_library_type STATIC)
+endif ()
+add_library(libcomps ${libcomps_library_type} ${libcomps_SOURCES})
target_link_libraries(libcomps ${EXPAT_LIBRARY})
target_link_libraries(libcomps ${LIBXML2_LIBRARIES})
target_link_libraries(libcomps ${ZLIB_LIBRARIES})
target_link_libraries(libcomps m)
set_target_properties(libcomps PROPERTIES OUTPUT_NAME "comps")
-set_target_properties(libcomps PROPERTIES SOVERSION ${VERSION})
+set_target_properties(libcomps PROPERTIES SOVERSION ${libcomps_VERSION_MAJOR})
add_dependencies(libcomps src-copy)
-IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
- SET (LIB_SUFFIX "64")
-ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8")
-set (LIB_INST_DIR ${CMAKE_INSTALL_LIBDIR})
+if (ENABLE_DEVELOPMENT OR "${libcomps_library_type}" STREQUAL "SHARED")
+ install (
+ TARGETS libcomps
+ RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development
+ )
+endif ()
+configure_file("${PROJECT_SOURCE_DIR}/../libcomps.pc.in"
"${CMAKE_CURRENT_BINARY_DIR}/libcomps.pc" @ONLY)
-install (FILES ${libcomps_HEADERS} DESTINATION include/libcomps)
-install (TARGETS libcomps LIBRARY DESTINATION ${LIB_INST_DIR})
+if (ENABLE_DEVELOPMENT)
+ install (FILES ${libcomps_HEADERS} DESTINATION include/libcomps)
+ install (TARGETS libcomps LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcomps.pc"
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
+endif ()
add_subdirectory(python)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libcomps-libcomps-0.1.11/libcomps/src/python/CMakeLists.txt
new/libcomps-libcomps-0.1.14/libcomps/src/python/CMakeLists.txt
--- old/libcomps-libcomps-0.1.11/libcomps/src/python/CMakeLists.txt
2019-03-11 08:09:27.000000000 +0100
+++ new/libcomps-libcomps-0.1.14/libcomps/src/python/CMakeLists.txt
2019-12-03 14:00:39.000000000 +0100
@@ -1,4 +1,7 @@
-include(tests/tests.cmake)
+if (ENABLE_TESTS)
+ include(tests/tests.cmake)
+endif ()
+
#include(pycopy.cmake)
include(pversion.cmake)
set(pycopy "py${pversion}-copy")
@@ -6,7 +9,10 @@
set (pycomps_TESTSDIR "${CMAKE_CURRENT_SOURCE_DIR}/tests/")
-set(PYCOMPS_LIB_PATH "${CMAKE_CURRENT_BINARY_DIR}/src/python${pversion}")
+set(PYCOMPS_LIB_PATH "${CMAKE_CURRENT_BINARY_DIR}/src/")
add_subdirectory(src)
-add_subdirectory(docs)
+
+if (ENABLE_DOCS)
+ add_subdirectory (docs)
+endif ()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libcomps-libcomps-0.1.11/libcomps/src/python/docs/doc-sources/conf.py.in
new/libcomps-libcomps-0.1.14/libcomps/src/python/docs/doc-sources/conf.py.in
---
old/libcomps-libcomps-0.1.11/libcomps/src/python/docs/doc-sources/conf.py.in
2019-03-11 08:09:27.000000000 +0100
+++
new/libcomps-libcomps-0.1.14/libcomps/src/python/docs/doc-sources/conf.py.in
2019-12-03 14:00:39.000000000 +0100
@@ -18,9 +18,9 @@
# documentation root, use os.path.abspath to make it absolute, like shown here.
import ctypes
-clibcomps = ctypes.cdll.LoadLibrary("@LIBCOMPS_OUT@/libcomps.so.@VERSION@")
+clibcomps =
ctypes.cdll.LoadLibrary("@LIBCOMPS_OUT@/libcomps.so.@libcomps_VERSION_MAJOR@")
os.environ['LD_LIBRARY_PATH'] = "%s" % "@LIBCOMPS_OUT@"
-print os.environ['LD_LIBRARY_PATH']
+print os.environ['LD_LIBRARY_PATH']
sys.path.insert(0, os.path.abspath("@PYCOMPS_LIB_PATH@"))
import libcomps
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libcomps-libcomps-0.1.11/libcomps/src/python/pycopy.cmake
new/libcomps-libcomps-0.1.14/libcomps/src/python/pycopy.cmake
--- old/libcomps-libcomps-0.1.11/libcomps/src/python/pycopy.cmake
2019-03-11 08:09:27.000000000 +0100
+++ new/libcomps-libcomps-0.1.14/libcomps/src/python/pycopy.cmake
2019-12-03 14:00:39.000000000 +0100
@@ -39,8 +39,8 @@
#file(COPY ${pycomps_TESTSDIR}/comps/${val} DESTINATION ./libcomps/comps/)
endforeach()
add_custom_command(TARGET ${pycopy} POST_BUILD COMMAND ${CMAKE_COMMAND} -E
- copy ${pycomps_SRCDIR}/__init__.py ${pycomps_LIBPATH}/libcomps/
- COMMENT "copy ${pycomps_SRCDIR}/__init__.py to
${pycomps_LIBPATH}/libcomps/")
+ copy ${pycomps_SRCDIR}/libcomps/__init__.py
${pycomps_LIBPATH}/libcomps/
+ COMMENT "copy ${pycomps_SRCDIR}/libcomps/__init__.py
to ${pycomps_LIBPATH}/libcomps/")
configure_file(${pycomps_TESTSDIR}run_tests.sh.in
${pycomps_LIBPATH}/libcomps/run_tests.sh)
#endif (NOT TARGET ${pycopy})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libcomps-libcomps-0.1.11/libcomps/src/python/src/CMakeLists.txt
new/libcomps-libcomps-0.1.14/libcomps/src/python/src/CMakeLists.txt
--- old/libcomps-libcomps-0.1.11/libcomps/src/python/src/CMakeLists.txt
2019-03-11 08:09:27.000000000 +0100
+++ new/libcomps-libcomps-0.1.14/libcomps/src/python/src/CMakeLists.txt
2019-12-03 14:00:39.000000000 +0100
@@ -42,4 +42,95 @@
LIST_REPLACE(pycomps_HEADERS ${i} "${CMAKE_CURRENT_SOURCE_DIR}/${val}")
endforeach(i)
-add_subdirectory(python${pversion})
+if (NOT SKBUILD)
+ if (${pversion} EQUAL 2)
+ find_package (PythonLibs 2.6)
+ find_package (PythonInterp 2.6 REQUIRED)
+ else ()
+ find_package (PythonLibs 3.0)
+ find_package (PythonInterp 3.0)
+ #add_custom_target(py3-copy)
+ endif ()
+endif(NOT SKBUILD)
+
+include_directories(${PYTHON_INCLUDE_PATH})
+include_directories(${LIBCOMPS_INCLUDE_PATH})
+
+if (ENABLE_TESTS)
+ configure_file(${pycomps_TESTSDIR}/run_tests.sh.in ./libcomps/run_tests.sh)
+endif ()
+
+if (${pversion} EQUAL 2)
+ add_library(pycomps SHARED ${pycomps_SRC})
+ set_target_properties(pycomps PROPERTIES LIBRARY_OUTPUT_DIRECTORY
"./libcomps")
+ set_target_properties(pycomps PROPERTIES PREFIX "_lib")
+ #set_target_properties(pycomps PROPERTIES LIBRARY_OUTPUT_NAME
"_libpycomps")
+ #add_dependencies(pycomps src-copy)
+ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+ SET(CMAKE_SKIP_BUILD_RPATH TRUE)
+ SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+else ()
+ include(../pycopy.cmake)
+
+ add_library(pycomps SHARED ${pycomps_SRC})
+ set_target_properties(pycomps PROPERTIES LIBRARY_OUTPUT_DIRECTORY
"./libcomps")
+ set_target_properties(pycomps PROPERTIES PREFIX "")
+ set_target_properties(pycomps PROPERTIES LIBRARY_OUTPUT_NAME "_libpycomps")
+ add_dependencies(pycomps src-copy)
+endif ()
+
+target_link_libraries(pycomps libcomps)
+target_link_libraries(pycomps ${EXPAT_LIBRARIES})
+target_link_libraries(pycomps ${LIBXML2_LIBRARIES})
+target_link_libraries(pycomps ${PYTHON_LIBRARIES})
+
+if ((${pversion} EQUAL 2) AND ENABLE_TESTS)
+ set(pycopy pytest_run)
+
+ add_custom_target(pytest_run)
+ add_dependencies(pytest_run pycomps)
+
+ include(../pycopy.cmake)
+
+ add_custom_command(TARGET pytest_run COMMAND ./run_tests.sh
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/libcomps/
+ COMMENT "Running python binding tests")
+endif ()
+
+if (ENABLE_TESTS)
+ add_custom_target(pytest_run COMMAND ./run_tests.sh
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/libcomps/
+ COMMENT "Running python binding tests")
+endif ()
+
+if (${pversion} EQUAL 2)
+ if (ENABLE_TESTS)
+ add_dependencies(pytest pytest_run)
+ endif ()
+else ()
+ add_dependencies(pycomps pycomps py3-copy)
+endif ()
+
+IF (SKBUILD)
+ find_package(PythonExtensions REQUIRED)
+ python_extension_module(pycomps)
+ INSTALL(FILES libcomps/__init__.py DESTINATION
libcomps/src/python/src/libcomps)
+ INSTALL(TARGETS pycomps LIBRARY DESTINATION
libcomps/src/python/src/libcomps)
+ELSE ()
+ EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout;
from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))"
OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
+
+ INSTALL(FILES ${pycomps_SRCDIR}/libcomps/__init__.py DESTINATION
${PYTHON_INSTALL_DIR}/libcomps)
+ #INSTALL(FILES ${pycomps_SRCDIR}/tests/__test.py DESTINATION
+ # ${PYTHON_INSTALL_DIR}/libcomps/)
+ #INSTALL(FILES ${pycomps_SRCDIR}/tests/fedora_comps.xml DESTINATION
+ # ${PYTHON_INSTALL_DIR}/libcomps/)
+ #INSTALL(FILES ${pycomps_SRCDIR}/tests/sample_comps.xml DESTINATION
+ # ${PYTHON_INSTALL_DIR}/libcomps/)
+ #INSTALL(FILES ${pycomps_SRCDIR}/tests/main_comps.xml DESTINATION
+ # ${PYTHON_INSTALL_DIR}/libcomps/)
+ #INSTALL(FILES ${pycomps_SRCDIR}/tests/main_comps2.xml DESTINATION
+ # ${PYTHON_INSTALL_DIR}/libcomps/)
+ INSTALL (TARGETS pycomps LIBRARY DESTINATION
${PYTHON_INSTALL_DIR}/libcomps)
+ # Version has to be passed as last argument.
+ INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE}
${CMAKE_SOURCE_DIR}/../setup_for_python_metadata.py install_egg_info
--install-dir \$ENV{DESTDIR}/${PYTHON_INSTALL_DIR}/ ${VERSION})")
+ENDIF (SKBUILD)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libcomps-libcomps-0.1.11/libcomps/src/python/src/__init__.py
new/libcomps-libcomps-0.1.14/libcomps/src/python/src/__init__.py
--- old/libcomps-libcomps-0.1.11/libcomps/src/python/src/__init__.py
2019-03-11 08:09:27.000000000 +0100
+++ new/libcomps-libcomps-0.1.14/libcomps/src/python/src/__init__.py
1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-from ._libpycomps import *
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libcomps-libcomps-0.1.11/libcomps/src/python/src/libcomps/__init__.py
new/libcomps-libcomps-0.1.14/libcomps/src/python/src/libcomps/__init__.py
--- old/libcomps-libcomps-0.1.11/libcomps/src/python/src/libcomps/__init__.py
1970-01-01 01:00:00.000000000 +0100
+++ new/libcomps-libcomps-0.1.14/libcomps/src/python/src/libcomps/__init__.py
2019-12-03 14:00:39.000000000 +0100
@@ -0,0 +1,2 @@
+from ._libpycomps import *
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libcomps-libcomps-0.1.11/libcomps/src/python/src/pycomps.c
new/libcomps-libcomps-0.1.14/libcomps/src/python/src/pycomps.c
--- old/libcomps-libcomps-0.1.11/libcomps/src/python/src/pycomps.c
2019-03-11 08:09:27.000000000 +0100
+++ new/libcomps-libcomps-0.1.14/libcomps/src/python/src/pycomps.c
2019-12-03 14:00:39.000000000 +0100
@@ -766,9 +766,9 @@
static PyMethodDef PyCOMPS_methods[] = {
{"groups_match", (PyCFunction)PyCOMPS_groups_match, METH_VARARGS |
METH_KEYWORDS,
PyCOMPS_validate__doc__},
- {"categories_match", (PyCFunction)PyCOMPS_categories_match, METH_KEYWORDS,
+ {"categories_match", (PyCFunction)PyCOMPS_categories_match, METH_VARARGS |
METH_KEYWORDS,
PyCOMPS_validate__doc__},
- {"environments_match", (PyCFunction)PyCOMPS_envs_match, METH_KEYWORDS,
+ {"environments_match", (PyCFunction)PyCOMPS_envs_match, METH_VARARGS |
METH_KEYWORDS,
PyCOMPS_validate__doc__},
{"validate", (PyCFunction)PyCOMPS_validate, METH_NOARGS,
PyCOMPS_validate__doc__},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libcomps-libcomps-0.1.11/libcomps/src/python/src/pycomps_dict.c
new/libcomps-libcomps-0.1.14/libcomps/src/python/src/pycomps_dict.c
--- old/libcomps-libcomps-0.1.11/libcomps/src/python/src/pycomps_dict.c
2019-03-11 08:09:27.000000000 +0100
+++ new/libcomps-libcomps-0.1.14/libcomps/src/python/src/pycomps_dict.c
2019-12-03 14:00:39.000000000 +0100
@@ -78,7 +78,7 @@
pairlist = comps_objdict_pairs(((PyCOMPS_Dict*)self)->dict);
char *tmpstr;
- for (it = pairlist->first; it != pairlist->last; it = it->next) {
+ for (it = pairlist->first; it != NULL; it = it->next) {
tmp = ret;
tmpkey = __pycomps_lang_decode(((COMPS_ObjRTreePair*)it->data)->key);
if (!tmpkey) {
@@ -99,24 +99,6 @@
Py_XDECREF(tmpkey);
Py_XDECREF(tmpval);
}
- tmp = ret;
- tmpkey = __pycomps_lang_decode(((COMPS_RTreePair*)it->data)->key);
- if (!tmpkey) {
- goto out;
- }
- tmpstr = comps_object_tostr(((COMPS_ObjRTreePair*)it->data)->data);
- tmpval = __pycomps_lang_decode(tmpstr);
- free(tmpstr);
- if (!tmpval) {
- //PyErr_SetString(PyExc_TypeError, "val convert error");
- goto out;
- }
- tmp2 = PyUnicode_FromFormat("%U = '%U'", tmpkey, tmpval);
- ret = PyUnicode_Concat(ret, tmp2);
- Py_XDECREF(tmp);
- Py_XDECREF(tmp2);
- Py_XDECREF(tmpkey);
- Py_XDECREF(tmpval);
tmp = ret;
tmp2 = PyUnicode_FromString("}");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libcomps-libcomps-0.1.11/libcomps/src/python/src/python2/CMakeLists.txt
new/libcomps-libcomps-0.1.14/libcomps/src/python/src/python2/CMakeLists.txt
--- old/libcomps-libcomps-0.1.11/libcomps/src/python/src/python2/CMakeLists.txt
2019-03-11 08:09:27.000000000 +0100
+++ new/libcomps-libcomps-0.1.14/libcomps/src/python/src/python2/CMakeLists.txt
1970-01-01 01:00:00.000000000 +0100
@@ -1,50 +0,0 @@
-find_package (PythonLibs 2.6)
-find_package (PythonInterp 2.6 REQUIRED)
-
-execute_process (COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from
distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))"
OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
-
-include_directories(${PYTHON_INCLUDE_PATH})
-include_directories(${LIBCOMPS_INCLUDE_PATH})
-
-configure_file(${pycomps_TESTSDIR}/run_tests.sh.in
- ./libcomps/run_tests.sh)
-
-add_library(pycomps SHARED ${pycomps_SRC})
-set_target_properties(pycomps PROPERTIES LIBRARY_OUTPUT_DIRECTORY "./libcomps")
-set_target_properties(pycomps PROPERTIES PREFIX "_lib")
-#set_target_properties(pycomps PROPERTIES LIBRARY_OUTPUT_NAME "_libpycomps")
-#add_dependencies(pycomps src-copy)
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-SET(CMAKE_SKIP_BUILD_RPATH TRUE)
-SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-
-target_link_libraries(pycomps libcomps)
-target_link_libraries(pycomps ${EXPAT_LIBRARIES})
-target_link_libraries(pycomps ${LIBXML2_LIBRARIES})
-target_link_libraries(pycomps ${PYTHON_LIBRARIES})
-
-set(pycopy pytest_run)
-
-add_custom_target(pytest_run)
-add_dependencies(pytest_run pycomps)
-
-include(../../pycopy.cmake)
-
-add_custom_command(TARGET pytest_run COMMAND ./run_tests.sh
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/libcomps/
- COMMENT "Running python binding tests")
-
-add_dependencies(pytest pytest_run)
-
-INSTALL(FILES ${pycomps_SRCDIR}/__init__.py DESTINATION
${PYTHON_INSTALL_DIR}/libcomps)
-#INSTALL(FILES ${pycomps_SRCDIR}/tests/__test.py DESTINATION
-# ${PYTHON_INSTALL_DIR}/libcomps/)
-#INSTALL(FILES ${pycomps_SRCDIR}/tests/fedora_comps.xml DESTINATION
-# ${PYTHON_INSTALL_DIR}/libcomps/)
-#INSTALL(FILES ${pycomps_SRCDIR}/tests/sample_comps.xml DESTINATION
-# ${PYTHON_INSTALL_DIR}/libcomps/)
-#INSTALL(FILES ${pycomps_SRCDIR}/tests/main_comps.xml DESTINATION
-# ${PYTHON_INSTALL_DIR}/libcomps/)
-#INSTALL(FILES ${pycomps_SRCDIR}/tests/main_comps2.xml DESTINATION
-# ${PYTHON_INSTALL_DIR}/libcomps/)
-INSTALL (TARGETS pycomps LIBRARY DESTINATION ${PYTHON_INSTALL_DIR}/libcomps)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libcomps-libcomps-0.1.11/libcomps/src/python/src/python3/CMakeLists.txt
new/libcomps-libcomps-0.1.14/libcomps/src/python/src/python3/CMakeLists.txt
--- old/libcomps-libcomps-0.1.11/libcomps/src/python/src/python3/CMakeLists.txt
2019-03-11 08:09:27.000000000 +0100
+++ new/libcomps-libcomps-0.1.14/libcomps/src/python/src/python3/CMakeLists.txt
1970-01-01 01:00:00.000000000 +0100
@@ -1,43 +0,0 @@
-find_package (PythonLibs 3.0)
-find_package (PythonInterp 3.0)
-#add_custom_target(py3-copy)
-
-execute_process (COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from
distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))"
OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
-
-include_directories(${PYTHON_INCLUDE_PATH})
-include_directories(${LIBCOMPS_INCLUDE_PATH})
-
-configure_file(${pycomps_TESTSDIR}/run_tests.sh.in
- ./libcomps/run_tests.sh)
-
-include(../../pycopy.cmake)
-
-add_library(pycomps SHARED ${pycomps_SRC})
-set_target_properties(pycomps PROPERTIES LIBRARY_OUTPUT_DIRECTORY "./libcomps")
-set_target_properties(pycomps PROPERTIES PREFIX "")
-set_target_properties(pycomps PROPERTIES LIBRARY_OUTPUT_NAME "_libpycomps")
-add_dependencies(pycomps src-copy)
-
-target_link_libraries(pycomps libcomps)
-target_link_libraries(pycomps ${EXPAT_LIBRARIES})
-target_link_libraries(pycomps ${LIBXML2_LIBRARIES})
-target_link_libraries(pycomps ${PYTHON_LIBRARIES})
-
-add_custom_target(pytest_run COMMAND ./run_tests.sh
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/libcomps/
- COMMENT "Running python binding tests")
-add_dependencies(pycomps pycomps py3-copy)
-
-
-INSTALL(FILES ${pycomps_SRCDIR}/__init__.py DESTINATION
${PYTHON_INSTALL_DIR}/libcomps)
-#INSTALL(FILES ${pycomps_SRCDIR}/tests/__test.py DESTINATION
-# ${PYTHON_INSTALL_DIR}/libcomps/)
-#INSTALL(FILES ${pycomps_SRCDIR}/tests/fedora_comps.xml DESTINATION
-# ${PYTHON_INSTALL_DIR}/libcomps/)
-#INSTALL(FILES ${pycomps_SRCDIR}/tests/sample_comps.xml DESTINATION
-# ${PYTHON_INSTALL_DIR}/libcomps/)
-#INSTALL(FILES ${pycomps_SRCDIR}/tests/main_comps.xml DESTINATION
-# ${PYTHON_INSTALL_DIR}/libcomps/)
-#INSTALL(FILES ${pycomps_SRCDIR}/tests/main_comps2.xml DESTINATION
-# ${PYTHON_INSTALL_DIR}/libcomps/)
-INSTALL (TARGETS pycomps LIBRARY DESTINATION ${PYTHON_INSTALL_DIR}/libcomps)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libcomps-libcomps-0.1.11/libcomps/src/python/tests/__test.py
new/libcomps-libcomps-0.1.14/libcomps/src/python/tests/__test.py
--- old/libcomps-libcomps-0.1.11/libcomps/src/python/tests/__test.py
2019-03-11 08:09:27.000000000 +0100
+++ new/libcomps-libcomps-0.1.14/libcomps/src/python/tests/__test.py
2019-12-03 14:00:39.000000000 +0100
@@ -225,7 +225,7 @@
def test_hash(self):
s = set()
for x in range(6):
- s.add(self.obj_constructor(**self.obj_data[x/2]))
+ s.add(self.obj_constructor(**self.obj_data[int(x/2)]))
self.assertTrue(len(s) == 3)
self.assertTrue(hash(self.obj_constructor(**self.obj_data[0])) ==\
hash(self.obj_constructor(**self.obj_data[0])))
@@ -891,8 +891,8 @@
gid1 = libcomps.GroupId("gid1")
gid2 = libcomps.GroupId("gid2", default=False)
gid3 = libcomps.GroupId("gid3", default=True)
- self.assertRaises(TypeError, gid1.__eq__, 1)
self.assertTrue(gid1 != None)
+ self.assertRaises(TypeError, gid1.__eq__, 1)
self.assertTrue(gid1 == gid1)
self.assertTrue(gid1 != "gid2")
self.assertTrue(gid1 != gid2)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libcomps-libcomps-0.1.11/libcomps/src/python/tests/comps/comps_empty_by_lang_tags.xml
new/libcomps-libcomps-0.1.14/libcomps/src/python/tests/comps/comps_empty_by_lang_tags.xml
---
old/libcomps-libcomps-0.1.11/libcomps/src/python/tests/comps/comps_empty_by_lang_tags.xml
1970-01-01 01:00:00.000000000 +0100
+++
new/libcomps-libcomps-0.1.14/libcomps/src/python/tests/comps/comps_empty_by_lang_tags.xml
2019-12-03 14:00:39.000000000 +0100
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
+<comps>
+ <group>
+ <id>birds</id>
+ <description></description>
+ </group>
+ <category>
+ <id>all</id>
+ <name>all</name>
+ </category>
+</comps>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libcomps-libcomps-0.1.11/libcomps/src/python/tests/test_libcomps.py
new/libcomps-libcomps-0.1.14/libcomps/src/python/tests/test_libcomps.py
--- old/libcomps-libcomps-0.1.11/libcomps/src/python/tests/test_libcomps.py
2019-03-11 08:09:27.000000000 +0100
+++ new/libcomps-libcomps-0.1.14/libcomps/src/python/tests/test_libcomps.py
2019-12-03 14:00:39.000000000 +0100
@@ -19,7 +19,6 @@
class TestLibcomps(unittest.TestCase):
def setUp(self):
- print (dir(libcomps))
self.comps = libcomps.Comps()
self.comps.fromxml_f("comps/comps-f21.xml")
self.tmp_dir = tempfile.mkdtemp()
@@ -154,6 +153,16 @@
#print self.comps.xml_str()
self.comps.fromxml_str(self.comps.xml_str())
+ def test_empty_by_lang_tags(self):
+ self.comps = libcomps.Comps()
+ self.comps.fromxml_f("comps/comps_empty_by_lang_tags.xml")
+ for group in self.comps.groups:
+ self.assertEqual("{}", str(group.name_by_lang))
+ self.assertEqual("{}", str(group.desc_by_lang))
+
+ for category in self.comps.categories:
+ self.assertEqual("{}", str(category.name_by_lang))
+ self.assertEqual("{}", str(category.desc_by_lang))
if __name__ == "__main__":
unittest.main(testRunner = utest.MyRunner)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libcomps-libcomps-0.1.11/libcomps/src/python/tests/test_merge_comps.py
new/libcomps-libcomps-0.1.14/libcomps/src/python/tests/test_merge_comps.py
--- old/libcomps-libcomps-0.1.11/libcomps/src/python/tests/test_merge_comps.py
2019-03-11 08:09:27.000000000 +0100
+++ new/libcomps-libcomps-0.1.14/libcomps/src/python/tests/test_merge_comps.py
2019-12-03 14:00:39.000000000 +0100
@@ -7,10 +7,10 @@
try:
import _libpycomps as libcomps
- print "local tests"
+ print("local tests")
except ImportError:
import libcomps
- print "global tests"
+ print("global tests")
class TestMergeComps(unittest.TestCase):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libcomps-libcomps-0.1.11/libcomps/version.cmake
new/libcomps-libcomps-0.1.14/libcomps/version.cmake
--- old/libcomps-libcomps-0.1.11/libcomps/version.cmake 2019-03-11
08:09:27.000000000 +0100
+++ new/libcomps-libcomps-0.1.14/libcomps/version.cmake 2019-12-03
14:00:39.000000000 +0100
@@ -1,5 +1,5 @@
set (libcomps_VERSION_MAJOR 0)
set (libcomps_VERSION_MINOR 1)
-set (libcomps_VERSION_PATCH 11)
+set (libcomps_VERSION_PATCH 14)
set (libcomps_RELEASE 1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libcomps-libcomps-0.1.11/libcomps.pc.in
new/libcomps-libcomps-0.1.14/libcomps.pc.in
--- old/libcomps-libcomps-0.1.11/libcomps.pc.in 2019-03-11 08:09:27.000000000
+0100
+++ new/libcomps-libcomps-0.1.14/libcomps.pc.in 2019-12-03 14:00:39.000000000
+0100
@@ -1,10 +1,11 @@
-prefix=/usr/local
-includedir=${prefix}/include
-libdir=${prefix}/lib@LIB_SUFFIX@
+prefix=@CMAKE_INSTALL_PREFIX@
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
Name: libcomps
Description: alternative for yum.libcomps written in C
Version: @VERSION@
-Requires: -L${libdir} -lcomps
-Reuires.private: -lxml2 -lexpat
+URL: https://github.com/rpm-software-management/libcomps
CFlags: -I${includedir}
+Libs: -L${libdir} -lcomps
+Requires: libxml-2.0 expat
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libcomps-libcomps-0.1.11/libcomps.spec
new/libcomps-libcomps-0.1.14/libcomps.spec
--- old/libcomps-libcomps-0.1.11/libcomps.spec 2019-03-11 08:09:27.000000000
+0100
+++ new/libcomps-libcomps-0.1.14/libcomps.spec 2019-12-03 14:00:39.000000000
+0100
@@ -13,7 +13,7 @@
%endif
Name: libcomps
-Version: 0.1.11
+Version: 0.1.14
Release: 1%{?dist}
Summary: Comps XML file manipulation library
@@ -170,6 +170,7 @@
%files devel
%{_libdir}/%{name}.so
+%{_libdir}/pkgconfig/%{name}.pc
%{_includedir}/%{name}/
%files doc
@@ -181,11 +182,13 @@
%if %{with python2}
%files -n python2-%{name}
%{python2_sitearch}/%{name}/
+%{python2_sitearch}/%{name}-%{version}-py%{python2_version}.egg-info
%endif
%if %{with python3}
%files -n python3-%{name}
%{python3_sitearch}/%{name}/
+%{python3_sitearch}/%{name}-%{version}-py%{python3_version}.egg-info
%endif
%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libcomps-libcomps-0.1.11/pyproject.toml
new/libcomps-libcomps-0.1.14/pyproject.toml
--- old/libcomps-libcomps-0.1.11/pyproject.toml 1970-01-01 01:00:00.000000000
+0100
+++ new/libcomps-libcomps-0.1.14/pyproject.toml 2019-12-03 14:00:39.000000000
+0100
@@ -0,0 +1,2 @@
+[build-system]
+requires = ["setuptools", "wheel", "scikit-build"]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libcomps-libcomps-0.1.11/rel-eng/packages/libcomps
new/libcomps-libcomps-0.1.14/rel-eng/packages/libcomps
--- old/libcomps-libcomps-0.1.11/rel-eng/packages/libcomps 2019-03-11
08:09:27.000000000 +0100
+++ new/libcomps-libcomps-0.1.14/rel-eng/packages/libcomps 2019-12-03
14:00:39.000000000 +0100
@@ -1 +1 @@
-0.1.11-1 ./
+0.1.14-1 ./
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libcomps-libcomps-0.1.11/setup.py
new/libcomps-libcomps-0.1.14/setup.py
--- old/libcomps-libcomps-0.1.11/setup.py 1970-01-01 01:00:00.000000000
+0100
+++ new/libcomps-libcomps-0.1.14/setup.py 2019-12-03 14:00:39.000000000
+0100
@@ -0,0 +1,52 @@
+import json
+
+from skbuild import setup
+
+
+with open('version.json', 'r+') as version_file:
+ version_dict = json.loads(version_file.read())
+ # build version string
+ version = '{major}.{minor}.{patch}-{release}'.format(
+ major=version_dict['libcomps_VERSION_MAJOR'],
+ minor=version_dict['libcomps_VERSION_MINOR'],
+ patch=version_dict['libcomps_VERSION_PATCH'],
+ release=version_dict['libcomps_RELEASE']
+ )
+
+setup(
+ name='libcomps',
+ description='Comps XML file manipulation library',
+ version=version,
+ license='GPLv2+',
+ author='RPM Software Management',
+ author_email='rpm-ecosys...@lists.rpm.org',
+ url='https://github.com/rpm-software-management',
+ classifiers=[
+ 'License :: OSI Approved :: GNU General Public License v2 or later
(GPLv2+)',
+ 'Operating System :: POSIX :: Linux',
+ 'Programming Language :: C',
+ 'Topic :: System :: Software Distribution',
+ 'Topic :: System :: Systems Administration',
+ "Programming Language :: Python :: 2",
+ 'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: 3',
+ 'Programming Language :: Python :: 3.4',
+ 'Programming Language :: Python :: 3.5',
+ 'Programming Language :: Python :: 3.6',
+ 'Programming Language :: Python :: 3.7',
+ 'Programming Language :: Python :: 3.8',
+ ],
+ packages=['libcomps'],
+ package_dir={
+ 'libcomps': 'libcomps/src/python/src/libcomps/'
+ },
+ cmake_args=[
+ '-DBIN_INSTALL_DIR:PATH=libcomps/src/python/src/libcomps/data/bin',
+ '-DBUILD_LIBCOMPS_SHARED:BOOL=OFF',
+ '-DENABLE_DEVELOPMENT:BOOL=OFF',
+ '-DENABLE_DOCS:BOOL=OFF',
+ '-DENABLE_TESTS:BOOL=OFF'
+ ],
+ cmake_languages=['C'],
+ cmake_source_dir="libcomps",
+)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libcomps-libcomps-0.1.11/setup_for_python_metadata.py
new/libcomps-libcomps-0.1.14/setup_for_python_metadata.py
--- old/libcomps-libcomps-0.1.11/setup_for_python_metadata.py 1970-01-01
01:00:00.000000000 +0100
+++ new/libcomps-libcomps-0.1.14/setup_for_python_metadata.py 2019-12-03
14:00:39.000000000 +0100
@@ -0,0 +1,34 @@
+from distutils.core import setup
+import sys
+
+# This is a simple and fragile way of creating python metadata for non
+# setuptools-guided installs (RPM builds). It's duplicate because of the
+# scikit-build dependency in normal setup.py.
+#
+# This script has to have the version always specified as last argument.
+version = sys.argv.pop()
+
+setup(
+ name='libcomps',
+ description='Comps XML file manipulation library',
+ version=version,
+ license='GPLv2+',
+ author='RPM Software Management',
+ author_email='rpm-ecosys...@lists.rpm.org',
+ url='https://github.com/rpm-software-management',
+ classifiers=[
+ 'License :: OSI Approved :: GNU General Public License v2 or later
(GPLv2+)',
+ 'Operating System :: POSIX :: Linux',
+ 'Programming Language :: C',
+ 'Topic :: System :: Software Distribution',
+ 'Topic :: System :: Systems Administration',
+ "Programming Language :: Python :: 2",
+ 'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: 3',
+ 'Programming Language :: Python :: 3.4',
+ 'Programming Language :: Python :: 3.5',
+ 'Programming Language :: Python :: 3.6',
+ 'Programming Language :: Python :: 3.7',
+ 'Programming Language :: Python :: 3.8',
+ ],
+)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libcomps-libcomps-0.1.11/version.json
new/libcomps-libcomps-0.1.14/version.json
--- old/libcomps-libcomps-0.1.11/version.json 2019-03-11 08:09:27.000000000
+0100
+++ new/libcomps-libcomps-0.1.14/version.json 2019-12-03 14:00:39.000000000
+0100
@@ -2,5 +2,5 @@
"libcomps_VERSION_MAJOR": 0,
"libcomps_RELEASE": 1,
"libcomps_VERSION_MINOR": 1,
- "libcomps_VERSION_PATCH": 11
+ "libcomps_VERSION_PATCH": 14
}
