Merge branch 'develop-create-python-folder' into develop

arras-energy · Mar 8, 2022 · 8da30ce · 8da30ce
2 parents be7203b + 1dd8841
commit 8da30ce
Show file tree

Hide file tree

Showing 26 changed files with 24 additions and 23 deletions.
diff --git a/.gitignore b/.gitignore
@@ -139,7 +139,7 @@ object_profile.txt
 fault_check.txt
 
 # specific outputs that should be ignored
-gldcore/link/python/example.png
+python/example.png
 models/ieee123/config/local.glm
 converters/autotest/IEEE-*-cyme/*
 gridlabd.glm
@@ -180,6 +180,7 @@ gldcore/autotest/output.csv
 python_extras/example/output.csv
 *.egg
 gridlabd.egg-info/
-gldcore/link/python/dist/
-gldcore/link/python/gridlabd.egg-info/
+python/dist/*.whl
+python/dist/*.tar.gz
+python/gridlabd.egg-info/
 gridlabd.egg-*
diff --git a/Makefile.am b/Makefile.am
@@ -60,6 +60,7 @@ include $(top_srcdir)/python_extras/Makefile.mk
 include $(top_srcdir)/converters/Makefile.mk
 include $(top_srcdir)/cloud/Makefile.mk
 include $(top_srcdir)/utilities/Makefile.mk
+include $(top_srcdir)/python/Makefile.mk
 
 # approved modules
 include $(top_srcdir)/modules.mk

diff --git a/gldcore/Makefile.mk b/gldcore/Makefile.mk
@@ -1,6 +1,5 @@
 include gldcore/link/engine/Makefile.mk
 include gldcore/link/matlab/Makefile.mk
-include gldcore/link/python/Makefile.mk
 include gldcore/rt/Makefile.mk
 include gldcore/solvers/Makefile.mk
 include gldcore/scripts/Makefile.mk
@@ -75,7 +74,7 @@ gridlabd_bin_SOURCES += gldcore/transform.cpp gldcore/transform.h
 gridlabd_bin_SOURCES += gldcore/unit.cpp gldcore/unit.h
 gridlabd_bin_SOURCES += gldcore/validate.cpp gldcore/validate.h
 gridlabd_bin_SOURCES += gldcore/version.cpp gldcore/version.h
-gridlabd_bin_SOURCES += gldcore/link/python/python.cpp
+gridlabd_bin_SOURCES += python/python.cpp
 
 EXTRA_gridlabd_bin_SOURCES =
 EXTRA_gridlabd_bin_SOURCES += gldcore/cmex.c gldcore/cmex.h

diff --git a/gldcore/link/python/Makefile.mk b/gldcore/link/python/Makefile.mk
diff --git a/python/Makefile.mk b/python/Makefile.mk
@@ -0,0 +1,13 @@
+$(top_srcdir)/python/dist/gridlabd-$(notdir $(prefix))-.tar.gz: gldcore/build.h
+	@echo "building $@"
+	@python3 -m pip install build 1>/dev/null
+	@( export SRCDIR=$(realpath $(top_srcdir)) ; python3 -m build $(top_srcdir)/python 1>/dev/null )
+
+python-install: $(top_srcdir)/python/dist/gridlabd-$(notdir $(prefix))-.tar.gz
+	@echo "installing $@"
+	@python3 -m pip install --ignore-installed $(top_srcdir)/python/dist/gridlabd-*.whl
+
+python-clean:
+	@rm $(top_srcdir)/python/dist/*.{whl,tar.gz}
+	@echo "uninstalling $(top_srcdir)/python"
+	@python3 -m pip uninstall gridlabd -y || (echo "Use '. utilities/cleanwc' instead to clean this build."; exit 1)
diff --git a/gldcore/link/python/README.md → python/README.md b/gldcore/link/python/README.md → python/README.md
diff --git a/...ython/autotest/test_external_callback.glm → python/autotest/test_external_callback.glm b/...ython/autotest/test_external_callback.glm → python/autotest/test_external_callback.glm
diff --git a/...python/autotest/test_external_callback.py → python/autotest/test_external_callback.py b/...python/autotest/test_external_callback.py → python/autotest/test_external_callback.py
diff --git a/gldcore/link/python/config_external.h → python/config_external.h b/gldcore/link/python/config_external.h → python/config_external.h
diff --git a/...ink/python/examples/example_1/handlers.py → python/examples/example_1/handlers.py b/...ink/python/examples/example_1/handlers.py → python/examples/example_1/handlers.py
diff --git a/.../link/python/examples/example_1/model.glm → python/examples/example_1/model.glm b/.../link/python/examples/example_1/model.glm → python/examples/example_1/model.glm
diff --git a/...ink/python/examples/example_2/handlers.py → python/examples/example_2/handlers.py b/...ink/python/examples/example_2/handlers.py → python/examples/example_2/handlers.py
diff --git a/...re/link/python/examples/example_2/main.py → python/examples/example_2/main.py b/...re/link/python/examples/example_2/main.py → python/examples/example_2/main.py
diff --git a/.../link/python/examples/example_2/model.glm → python/examples/example_2/model.glm b/.../link/python/examples/example_2/model.glm → python/examples/example_2/model.glm
diff --git a/...re/link/python/examples/example_3/main.py → python/examples/example_3/main.py b/...re/link/python/examples/example_3/main.py → python/examples/example_3/main.py
diff --git a/.../link/python/examples/example_3/model.glm → python/examples/example_3/model.glm b/.../link/python/examples/example_3/model.glm → python/examples/example_3/model.glm
diff --git a/gldcore/link/python/examples/example_3/x.csv → python/examples/example_3/x.csv b/gldcore/link/python/examples/example_3/x.csv → python/examples/example_3/x.csv
diff --git a/...python/examples/example_4/test_memory.glm → python/examples/example_4/test_memory.glm b/...python/examples/example_4/test_memory.glm → python/examples/example_4/test_memory.glm
diff --git a/.../python/examples/example_4/test_memory.py → python/examples/example_4/test_memory.py b/.../python/examples/example_4/test_memory.py → python/examples/example_4/test_memory.py
diff --git a/.../examples/example_4/test_memory_module.py → .../examples/example_4/test_memory_module.py b/.../examples/example_4/test_memory_module.py → .../examples/example_4/test_memory_module.py
diff --git a/gldcore/link/python/gridlabd_python.py → python/gridlabd_python.py b/gldcore/link/python/gridlabd_python.py → python/gridlabd_python.py
diff --git a/gldcore/link/python/pstatus.py → python/pstatus.py b/gldcore/link/python/pstatus.py → python/pstatus.py
diff --git a/gldcore/link/python/python.cpp → python/python.cpp b/gldcore/link/python/python.cpp → python/python.cpp
diff --git a/gldcore/link/python/python_gridlabd.py → python/python_gridlabd.py b/gldcore/link/python/python_gridlabd.py → python/python_gridlabd.py
diff --git a/gldcore/link/python/setup.py → python/setup.py b/gldcore/link/python/setup.py → python/setup.py
@@ -6,18 +6,18 @@
 To build only the python module use the following command can be run after gridlabd is installed
 
   bash% export SRCDIR=$PWD
-  bash% python gldcore/link/python/setup.py build
+  bash% python python/setup.py build
 
 
 To install the python module use the following command:
 
   bash% export SRCDIR=$PWD
-  bash% python gldcore/link/python/setup.py install
+  bash% python python/setup.py install
 
 To uninstall the python module, you must save the list of installed files
 
   bash% export SRCDIR=$PWD
-  bash% python gldcore/link/python/setup.py install --record files.txt
+  bash% python python/setup.py install --record files.txt
 
 Then you can uninstall gridlabd's python module using the command
 
@@ -47,10 +47,10 @@
 
 from distutils.core import setup, Extension
 gridlabd = Extension('gridlabd', 
-	include_dirs = list(map(lambda x: srcdir+'/'+x,['gldcore/link/python','gldcore'])),
+	include_dirs = list(map(lambda x: srcdir+'/'+x,['python','gldcore'])),
 	extra_compile_args = compile_options,
 	libraries = ['ncurses', 'curl'],
-	sources = list(map(lambda x: srcdir+'/'+x,['gldcore/link/python/python.cpp',
+	sources = list(map(lambda x: srcdir+'/'+x,['python/python.cpp',
 		'gldcore/aggregate.cpp',
 		'gldcore/class.cpp',
 		'gldcore/cmdarg.cpp',

diff --git a/gldcore/link/python/validate.py → python/validate.py b/gldcore/link/python/validate.py → python/validate.py