fixed issue #12

etijskens · Nov 11, 2019 · f38c9d4 · f38c9d4
1 parent 8e38f83
commit f38c9d4
Show file tree

Hide file tree

Showing 28 changed files with 36 additions and 3 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -1,9 +1,15 @@
 This section summarizes all my steps on the way to a working micc,
 including dead-ends.
 
+
+
 issue: micc is no longer compatible with itself: `micc add foo --f2py` fails.
 That is of course only a problem for myself. 
 
+v0.7.5 (2019-11-11)
+===================
+* fixed `Github issue #12 <https://github.com/etijskens/micc/issues/12>`_
+
 v0.7.4 (2019-10-23)
 ===================
 * `Github issue #3 <https://github.com/etijskens/micc/issues/3>`_

diff --git a/micc.json b/micc.json
@@ -50,5 +50,8 @@
 					  },
   "cookiecutter"	: {"default": "~/software/dev/workspace/micc/cookiecutter-mypackage"
   					  ,"text"   :"location of the cookiecutter template"
-  					  }
+  					  },
+  "py"				: {"default":"py"
+					  ,"text"   :"python file extension"
+					  }
 }
diff --git a/micc/micc.json b/micc/micc.json
@@ -26,4 +26,8 @@
   					  ,"type"   :"click.Choice(['MIT license', 'BSD license', 'ISC license', 'Apache Software License 2.0', 'GNU General Public License v3', 'Not open source'])"
   					  ,"text"   :"Choose open source license"
 					  }  					  
+, "py"
+					: {"default":"py"
+					  ,"text"   :"python file extension"
+					  }
 }
diff --git a/...sts/test_{{cookiecutter.cli_app_name}}.py → ...cutter.cli_app_name}}.{{cookiecutter.py}} b/...sts/test_{{cookiecutter.cli_app_name}}.py → ...cutter.cli_app_name}}.{{cookiecutter.py}}
diff --git a/...e_name}}/{{cookiecutter.cli_app_name}}.py → ...cutter.cli_app_name}}.{{cookiecutter.py}} b/...e_name}}/{{cookiecutter.cli_app_name}}.py → ...cutter.cli_app_name}}.{{cookiecutter.py}}
diff --git a/...sts/test_{{cookiecutter.cli_app_name}}.py → ...cutter.cli_app_name}}.{{cookiecutter.py}} b/...sts/test_{{cookiecutter.cli_app_name}}.py → ...cutter.cli_app_name}}.{{cookiecutter.py}}
diff --git a/...e_name}}/{{cookiecutter.cli_app_name}}.py → ...cutter.cli_app_name}}.{{cookiecutter.py}} b/...e_name}}/{{cookiecutter.cli_app_name}}.py → ...cutter.cli_app_name}}.{{cookiecutter.py}}
diff --git a/.../test_cpp_{{cookiecutter.module_name}}.py → ...ecutter.module_name}}.{{cookiecutter.py}} b/.../test_cpp_{{cookiecutter.module_name}}.py → ...ecutter.module_name}}.{{cookiecutter.py}}
diff --git a/...test_f2py_{{cookiecutter.module_name}}.py → ...ecutter.module_name}}.{{cookiecutter.py}} b/...test_f2py_{{cookiecutter.module_name}}.py → ...ecutter.module_name}}.{{cookiecutter.py}}
diff --git a/...ests/test_{{cookiecutter.module_name}}.py → ...ecutter.module_name}}.{{cookiecutter.py}} b/...ests/test_{{cookiecutter.module_name}}.py → ...ecutter.module_name}}.{{cookiecutter.py}}
diff --git a/...ge_name}}/{{cookiecutter.module_name}}.py → ...ecutter.module_name}}.{{cookiecutter.py}} b/...ge_name}}/{{cookiecutter.module_name}}.py → ...ecutter.module_name}}.{{cookiecutter.py}}
diff --git a/...es/package-base/hooks/post_gen_project.py → ...ooks/post_gen_project.{{cookiecutter.py}} b/...es/package-base/hooks/post_gen_project.py → ...ooks/post_gen_project.{{cookiecutter.py}}
diff --git a/...tes/package-base/hooks/pre_gen_project.py → ...hooks/pre_gen_project.{{cookiecutter.py}} b/...tes/package-base/hooks/pre_gen_project.py → ...hooks/pre_gen_project.{{cookiecutter.py}}
diff --git a/...iecutter.package_name}}/tests/__init__.py → ...name}}/tests/__init__.{{cookiecutter.py}} b/...iecutter.package_name}}/tests/__init__.py → ...name}}/tests/__init__.{{cookiecutter.py}}
diff --git a/...sts/test_{{cookiecutter.package_name}}.py → ...cutter.package_name}}.{{cookiecutter.py}} b/...sts/test_{{cookiecutter.package_name}}.py → ...cutter.package_name}}.{{cookiecutter.py}}
diff --git a/...ge-general-docs/hooks/post_gen_project.py → ...ooks/post_gen_project.{{cookiecutter.py}} b/...ge-general-docs/hooks/post_gen_project.py → ...ooks/post_gen_project.{{cookiecutter.py}}
diff --git a/...age-general-docs/hooks/pre_gen_project.py → ...hooks/pre_gen_project.{{cookiecutter.py}} b/...age-general-docs/hooks/pre_gen_project.py → ...hooks/pre_gen_project.{{cookiecutter.py}}
diff --git a/...package-general/hooks/post_gen_project.py → ...ooks/post_gen_project.{{cookiecutter.py}} b/...package-general/hooks/post_gen_project.py → ...ooks/post_gen_project.{{cookiecutter.py}}
diff --git a/.../package-general/hooks/pre_gen_project.py → ...hooks/pre_gen_project.{{cookiecutter.py}} b/.../package-general/hooks/pre_gen_project.py → ...hooks/pre_gen_project.{{cookiecutter.py}}
diff --git a/...{{cookiecutter.package_name}}/__init__.py → ...ckage_name}}/__init__.{{cookiecutter.py}} b/...{{cookiecutter.package_name}}/__init__.py → ...ckage_name}}/__init__.{{cookiecutter.py}}
diff --git a/...age-simple-docs/hooks/post_gen_project.py → ...ooks/post_gen_project.{{cookiecutter.py}} b/...age-simple-docs/hooks/post_gen_project.py → ...ooks/post_gen_project.{{cookiecutter.py}}
diff --git a/...kage-simple-docs/hooks/pre_gen_project.py → ...hooks/pre_gen_project.{{cookiecutter.py}} b/...kage-simple-docs/hooks/pre_gen_project.py → ...hooks/pre_gen_project.{{cookiecutter.py}}
diff --git a/...{cookiecutter.project_name}}/docs/conf.py → ...ject_name}}/docs/conf.{{cookiecutter.py}} b/...{cookiecutter.project_name}}/docs/conf.py → ...ject_name}}/docs/conf.{{cookiecutter.py}}
diff --git a/.../package-simple/hooks/post_gen_project.py → ...ooks/post_gen_project.{{cookiecutter.py}} b/.../package-simple/hooks/post_gen_project.py → ...ooks/post_gen_project.{{cookiecutter.py}}
diff --git a/...s/package-simple/hooks/pre_gen_project.py → ...hooks/pre_gen_project.{{cookiecutter.py}} b/...s/package-simple/hooks/pre_gen_project.py → ...hooks/pre_gen_project.{{cookiecutter.py}}
diff --git a/...t_name}}/{{cookiecutter.package_name}}.py → ...cutter.package_name}}.{{cookiecutter.py}} b/...t_name}}/{{cookiecutter.package_name}}.py → ...cutter.package_name}}.{{cookiecutter.py}}
@@ -10,11 +10,11 @@
 
 def hello(who='world'):
     """'Hello world' method.
-    
+
     :param str who: whom to say hello to
     :returns: a string
     """
     result = "Hello " + who
     return result
 
-# eof
+# eof
diff --git a/micc_custom_build.py b/micc_custom_build.py
@@ -0,0 +1,14 @@
+from pathlib import Path
+#if there is a custom build step the wheel tags are specific.
+
+def build(setup_kwargs):
+
+    print('hello')
+    for k,v in setup_kwargs.items():
+        print(k,':',v)
+    d = Path.cwd() / 'micc'
+    glob = d.glob('*')
+    for v in glob:
+        print(v)
+#     raise Exception(f"cwd = {Path.cwd()}\n{glob}") 
+    return 0
diff --git a/pyproject.toml b/pyproject.toml
@@ -12,6 +12,12 @@ homepage = "https://github.com/etijskens/micc"
 
 keywords = ['packaging', 'poetry']
 
+# packages = [
+#     { include = "micc" },
+# ]
+#include = ["templates/**/*"]
+build = "micc_custom_build.py"
+
 [tool.poetry.dependencies]
 python = "^3.7"
 click = "^7.0"