FIX-ADD: pythonnet pip dependecy spec in conda env.yml

Author: 9and3

CMakeLists.txt

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

cmake/activate_conda.bat

@@ -32,14 +32,6 @@ exit /b 1
 :end
 echo Anaconda3 found.
 
-:: check if a different environment then diff_check is activated, if so deactivate it
-for /f "delims=" %%i in ('conda env list ^| findstr /C:"*"') do set "active_env=%%i"
-for /f "delims= " %%j in ("%active_env%") do set "active_env_name=%%j"
-if not "%active_env_name%"=="diff_check" (
-    echo You should deactivating %active_env_name% firs
-    echo Call "conda deactivate"
-)
-
 :: Check if the diff_check environment is available
 call conda env list | findstr /C:"diff_check" >nul 2>nul
 if %ERRORLEVEL% neq 0 (
@@ -57,4 +49,12 @@ if %ERRORLEVEL% neq 0 (
 )
 echo diff_check environment is up to date.
 
+:: check if a different environment then diff_check is activated, if so deactivate it
+for /f "delims=" %%i in ('conda env list ^| findstr /C:"*"') do set "active_env=%%i"
+for /f "delims= " %%j in ("%active_env%") do set "active_env_name=%%j"
+if not "%active_env_name%"=="diff_check" (
+    echo You should deactivating %active_env_name% first with "conda deactivate" and "conda activate diff_check" before running this script.
+    exit /b 1
+)
+
 echo you can start the cmake config now ...

environment.yml

@@ -13,6 +13,7 @@ def main(
     path_manifest: str,
     path_setup: str,
     path_init: str,
+    path_cmake: str,
     is_from_manifest: bool,
     *args, **kwargs
 ) -> bool:
@@ -77,6 +78,15 @@ def main(
     with open(path_init, "w") as f:
         f.write(init)
 
+    # modify the CMake file
+    cmake_crt_version = None
+    # search the first "project" line
+    with open(path_cmake, "r") as f:
+        cmake = f.read()
+    cmake = re.sub(r"(project\(diffCheck VERSION )(\d+\.\d+\.\d+)", r"\g<1>" + version, cmake)
+    with open(path_cmake, "w") as f:
+        f.write(cmake)
+
     return True
 
 if __name__ == "__main__":
@@ -98,24 +108,31 @@ def main(
     parser.add_argument(
         "--path-manifest",
         type=str,
-        required=False,
+        required=True,
         default="./manifest.yml",
         help="The path to the manifest file."
     )
     parser.add_argument(
         "--path-setup",
         type=str,
-        required=False,
-        default="./py/pypi/setup.py",
+        required=True,
+        default="./src/gh/diffCheck/setup.py",
         help="The path to the setup file."
     )
     parser.add_argument(
         "--path-init",
         type=str,
-        required=False,
-        default="./py/pypi/ACPy/__init__.py",
+        required=True,
+        default="./src/gh/diffCheck/diffCheck/__init__.py",
         help="The path to the __init__ file."
     )
+    parser.add_argument(
+        "--path-cmake",
+        type=str,
+        required=True,
+        default="./CMakeLists.txt",
+        help="The path to the CMake file."
+    )
 
     args = parser.parse_args()
     parse_errors = []
@@ -154,23 +171,17 @@ def main(
         is_init_ok = False
         parse_errors.append(f"Path to __init__ file is invalid: {args.path_init}")
 
+    is_cmake_ok = True
+    if not os.path.isfile(args.path_cmake):
+        is_cmake_ok = False
+        parse_errors.append(f"Path to CMake file is invalid: {args.path_cmake}")
+
     print("Versionizer checks:")
-    if is_version_ok:
-        print("\t[x] Correct version format")
-    else:
-        print(f"\t[ ] Correct version format")
-    if is_manifest_ok:
-        print("\t[x] Manifest file path is valid")
-    else:
-        print(f"\t[ ] Manifest file path is valid")
-    if is_setup_ok:
-        print("\t[x] Setup file path is valid")
-    else:
-        print(f"\t[ ] Setup file path is valid")
-    if is_init_ok:
-        print("\t[x] __init__ file path is valid")
-    else:
-        print(f"\t[ ] __init__ file path is valid")
+    print(f"\t[{'x' if is_version_ok else ' '}] Correct version format: {args.version}")
+    print(f"\t[{'x' if is_manifest_ok else ' '}] Manifest file exists: {args.path_manifest}")
+    print(f"\t[{'x' if is_setup_ok else ' '}] Setup file exists: {args.path_setup}")
+    print(f"\t[{'x' if is_init_ok else ' '}] __init__ file exists: {args.path_init}")
+    print(f"\t[{'x' if is_cmake_ok else ' '}] CMake file exists: {args.path_cmake}")
     if parse_errors.__len__() != 0:
         print("[ERRORS]:")
         for error in parse_errors:
@@ -183,6 +194,7 @@ def main(
         path_manifest=args.path_manifest,
         path_setup=args.path_setup,
         path_init=args.path_init,
+        path_cmake=args.path_cmake,
         is_from_manifest=args.from_manifest
     )
 

invokes/versionize.py

@@ -1,6 +1,6 @@
 ---
 name: diffCheck
-version: 0.0.18
+version: 0.0.23
 authors:
 - Andrea Settimi
 - Damien Gilliard

manifest.yml

@@ -1,7 +1,7 @@
 import os
 import sys
 
-__version__ = "0.0.17"
+__version__ = "0.0.23"
 
 PATH_TO_DLL = "dlls"
 extra_dll_dir = os.path.join(os.path.dirname(__file__), PATH_TO_DLL)

src/gh/diffCheck/diffCheck/__init__.py

@@ -8,7 +8,7 @@
 
 setup(
     name="diffCheck",
-    version="0.0.17",
+    version="0.0.23",
     packages=find_packages(),
     install_requires=[
         "numpy",

src/gh/diffCheck/setup.py

@@ -1,15 +1,27 @@
 # tasks.py
 from invoke import task
 
-@task
-def ghcomponentize(c):
-    path_ghcomponentizer = "./invokes/ghcomponentize/ghcomponentizer.py"
-    c.run(f"python {path_ghcomponentizer} --ghio ./invokes/ghcomponentize/ghio ./py/components ./build/gh")
+PATH_MANIFEST = "./manifest.yml"
+PATH_SETUP = "./src/gh/diffCheck/setup.py"
+PATH_INIT = "./src/gh/diffCheck/diffCheck/__init__.py"
+PATH_CMAKE = "./CMakeLists.txt"
+
 
 @task
 def versionize(c):
     path_versionize = "./invokes/versionize.py"
-    c.run(f"python {path_versionize} --from-manifest")
+    c.run(f"python {path_versionize} \
+        --from-manifest \
+        --path-manifest {PATH_MANIFEST} \
+        --path-setup {PATH_SETUP} \
+        --path-init {PATH_INIT} \
+        --path-cmake {PATH_CMAKE} \
+    ")
+
+@task
+def ghcomponentize(c):
+    path_ghcomponentizer = "./invokes/ghcomponentize/ghcomponentizer.py"
+    c.run(f"python {path_ghcomponentizer} --ghio ./invokes/ghcomponentize/ghio ./py/components ./build/gh")
 
 @task
 def flagerize(c, package_name="ACPy"):