CAP-ADD: flagerzer invoke done

Author: 9and3

CMakeLists.txt

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

invokes/flagerize.py

@@ -7,27 +7,30 @@
 
 import typing
 
+
 def main(
     package: str,
     from_manifest: bool,
     path_manifest: str,
-    *args, **kwargs
+    source: str,
+    version: str
 ) -> bool:
     # for all the files that are called code.py in the components folder
     # stamp on the second line of the file by not overwriting the first line
-    for root, dirs, files in os.walk("./py/components/"):
+    for root, dirs, files in os.walk(source):
         for file in files:
             if file == "code.py":
                 path = os.path.join(root, file)
                 with open(path, "r") as f:
                     lines = f.readlines()
-                # check if the line # r: package_name is already in the first 10 lines
+                # check if the line # r: package_name is already in the first 10 lines, erase it
                 if any([re.search(r"# r: .+==", line) for line in lines[:10]]):
                     print(f"File {path} is already stamped with the package version.")
-                    return False
+                    lines = [line for line in lines if not re.search(r"# r: .+==", line)]
+
                 with open(path, "w") as f:
                     f.write(lines[0])
-                    f.write(f"# r: {package}=={kwargs['version']}\n")
+                    f.write(f"# r: {package}=={version}\n")
                     for line in lines[1:]:
                         f.write(line)
     print("Done stamping components with version number of the pypi package.")
@@ -46,7 +49,7 @@ def main(
     parser.add_argument(
         "--source",
         type=str,
-        required=False,
+        required=True,
         default="./py/components/",
         help="The path to component folders."
     )
@@ -59,7 +62,7 @@ def main(
     parser.add_argument(
         "--path-manifest",
         type=str,
-        required=False,
+        required=True,
         default="./manifest.yml",
         help="The path to the manifest file."
     )
@@ -137,6 +140,7 @@ def main(
         package=args.package,
         from_manifest=args.from_manifest,
         path_manifest=args.path_manifest,
+        source=args.source,
         version=_version
     )
 

manifest.yml

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

src/gh/components/DF_xml_exporter/code.py

@@ -1,5 +1,4 @@
 #! python3
-# r: diffCheck==0.0.9
 
 import System
 import typing

src/gh/diffCheck/diffCheck/__init__.py

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

src/gh/diffCheck/setup.py

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

tasks.py

@@ -33,13 +33,16 @@ def pypireize(c):
     path_pypireize = "./invokes/pypireize.py"
     c.run(f"python {path_pypireize} --setup-path {PATH_SETUP}")
 
-
-
-
 @task
-def flagerize(c, package_name="ACPy"):
+def flagerize(c, package_name="diffCheck"):
     path_flagerize = "./invokes/flagerize.py"
-    c.run(f"python {path_flagerize} --package {package_name} --from-manifest")
+    c.run(f"python {path_flagerize} \
+        --package {package_name} \
+        --source {DIR_IN_GHUSER_COMPONENTS} \
+        --from-manifest \
+        --path-manifest {PATH_MANIFEST}")
+
+
 
 
 @task