FIX: conflicts for PR

Author: 9and3

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.16.)
-project(diffCheck VERSION 1.1.0 LANGUAGES CXX C)
+project(diffCheck VERSION 1.1.1 LANGUAGES CXX C)
 set(CMAKE_CXX_STANDARD 17)
 
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)

invokes/yakerize.py

@@ -1,5 +1,9 @@
 #! python3
-
+"""
+Yakerize.py was originally developed as part of the DiffCheck plugin by
+Andrea Settimi, Damien Gilliard, Eleni Skevaki, Marirena Kladeftira (IBOIS, CRCL, EPFL) in 2024.
+It is distributed under the MIT License, provided this attribution is retained.
+"""
 import os
 import sys
 import argparse

manifest.yml

@@ -1,6 +1,6 @@
 ---
 name: diffCheck
-version: 1.1.0
+version: 1.2.0
 authors:
 - Andrea Settimi
 - Damien Gilliard

src/gh/diffCheck/diffCheck/__init__.py

@@ -1,6 +1,6 @@
 import os
 
-__version__ = "1.1.0"
+__version__ = "1.1.1"
 
 # make the dlls available to the python interpreter
 PATH_TO_DLL = "dlls"

src/gh/diffCheck/setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name="diffCheck",
-    version="1.1.0",
+    version="1.1.1",
     packages=find_packages(),
     install_requires=[
         "numpy",