Quellcode durchsuchen

ctypes: move directory out of python/grass (#1898)

* move python/grass/ctypes directory out of python/grass and rename it

* reintroduce (now renamed) __init__ and compile ALL files (fixing regression caused by
https://github.com/OSGeo/grass/commit/ca2d28a592064b501c0eb6c4ec648984f386dd42)
nilason vor 3 Jahren
Ursprung
Commit
be3565486a
49 geänderte Dateien mit 11 neuen und 9 gelöschten Zeilen
  1. 1 1
      .flake8
  2. 1 1
      pyproject.toml
  3. 2 1
      python/Makefile
  4. 0 1
      python/grass/Makefile
  5. 6 4
      python/grass/ctypes/Makefile
  6. 1 1
      python/grass/ctypes/README.md
  7. 0 0
      python/libgrass_interface_generator/ctypesgen/LICENSE
  8. 0 0
      python/libgrass_interface_generator/ctypesgen/__init__.py
  9. 0 0
      python/libgrass_interface_generator/ctypesgen/ctypedescs.py
  10. 0 0
      python/libgrass_interface_generator/ctypesgen/descriptions.py
  11. 0 0
      python/libgrass_interface_generator/ctypesgen/expressions.py
  12. 0 0
      python/libgrass_interface_generator/ctypesgen/libraryloader.py
  13. 0 0
      python/libgrass_interface_generator/ctypesgen/main.py
  14. 0 0
      python/libgrass_interface_generator/ctypesgen/messages.py
  15. 0 0
      python/libgrass_interface_generator/ctypesgen/options.py
  16. 0 0
      python/libgrass_interface_generator/ctypesgen/parser/.gitignore
  17. 0 0
      python/libgrass_interface_generator/ctypesgen/parser/__init__.py
  18. 0 0
      python/libgrass_interface_generator/ctypesgen/parser/cdeclarations.py
  19. 0 0
      python/libgrass_interface_generator/ctypesgen/parser/cgrammar.py
  20. 0 0
      python/libgrass_interface_generator/ctypesgen/parser/cparser.py
  21. 0 0
      python/libgrass_interface_generator/ctypesgen/parser/ctypesparser.py
  22. 0 0
      python/libgrass_interface_generator/ctypesgen/parser/datacollectingparser.py
  23. 0 0
      python/libgrass_interface_generator/ctypesgen/parser/lex.py
  24. 0 0
      python/libgrass_interface_generator/ctypesgen/parser/lextab.py
  25. 0 0
      python/libgrass_interface_generator/ctypesgen/parser/parsetab.py
  26. 0 0
      python/libgrass_interface_generator/ctypesgen/parser/pplexer.py
  27. 0 0
      python/libgrass_interface_generator/ctypesgen/parser/preprocessor.py
  28. 0 0
      python/libgrass_interface_generator/ctypesgen/parser/yacc.py
  29. 0 0
      python/libgrass_interface_generator/ctypesgen/printer_json/__init__.py
  30. 0 0
      python/libgrass_interface_generator/ctypesgen/printer_json/printer.py
  31. 0 0
      python/libgrass_interface_generator/ctypesgen/printer_json/test.py
  32. 0 0
      python/libgrass_interface_generator/ctypesgen/printer_python/__init__.py
  33. 0 0
      python/libgrass_interface_generator/ctypesgen/printer_python/defaultheader.py
  34. 0 0
      python/libgrass_interface_generator/ctypesgen/printer_python/preamble/2_5.py
  35. 0 0
      python/libgrass_interface_generator/ctypesgen/printer_python/preamble/2_7.py
  36. 0 0
      python/libgrass_interface_generator/ctypesgen/printer_python/preamble/3_2.py
  37. 0 0
      python/libgrass_interface_generator/ctypesgen/printer_python/preamble/__init__.py
  38. 0 0
      python/libgrass_interface_generator/ctypesgen/printer_python/printer.py
  39. 0 0
      python/libgrass_interface_generator/ctypesgen/printer_python/test.py
  40. 0 0
      python/libgrass_interface_generator/ctypesgen/processor/__init__.py
  41. 0 0
      python/libgrass_interface_generator/ctypesgen/processor/dependencies.py
  42. 0 0
      python/libgrass_interface_generator/ctypesgen/processor/operations.py
  43. 0 0
      python/libgrass_interface_generator/ctypesgen/processor/pipeline.py
  44. 0 0
      python/libgrass_interface_generator/ctypesgen/test/.gitignore
  45. 0 0
      python/libgrass_interface_generator/ctypesgen/test/ctypesgentest.py
  46. 0 0
      python/libgrass_interface_generator/ctypesgen/test/testsuite.py
  47. 0 0
      python/libgrass_interface_generator/ctypesgen/version.py
  48. 0 0
      python/libgrass_interface_generator/libgrass__init__.py
  49. 0 0
      python/libgrass_interface_generator/run.py

+ 1 - 1
.flake8

@@ -243,7 +243,7 @@ exclude =
     # Test output directory
     testreport,
     # Not yet compliant
-    python/grass/ctypes,
+    python/libgrass_interface_generator,
     # No tests checked for now
     testsuite,
 

+ 1 - 1
pyproject.toml

@@ -18,7 +18,7 @@ exclude = '''
         | bin\..*
         | dist\..*
     )/
-    | python/grass/ctypes/
+    | python/libgrass_interface_generator/
     # Bug in Black related to r-string prefix capitalization reformats
     # a line in this file unnecessarily. File is however fully Black-formatted
     # at the time of writing.

+ 2 - 1
python/Makefile

@@ -3,7 +3,8 @@ MODULE_TOPDIR = ..
 include $(MODULE_TOPDIR)/include/Make/Vars.make
 
 SUBDIRS = \
-	grass
+	grass \
+	libgrass_interface_generator
 
 include $(MODULE_TOPDIR)/include/Make/Dir.make
 

+ 0 - 1
python/grass/Makefile

@@ -9,7 +9,6 @@ SUBDIRS = \
 	app \
 	bandref \
 	benchmark \
-	ctypes \
 	exceptions \
 	grassdb \
 	gunittest \

+ 6 - 4
python/grass/ctypes/Makefile

@@ -1,4 +1,4 @@
-MODULE_TOPDIR = ../../..
+MODULE_TOPDIR = ../..
 
 PACKAGE = "grasslibs"
 
@@ -75,11 +75,11 @@ PYDIR = $(ETC)/python
 GDIR = $(PYDIR)/grass
 DSTDIR = $(GDIR)/lib
 
-PYFILES  := $(patsubst %,$(DSTDIR)/%.py,$(MODULES))
-PYCFILES  := $(patsubst %,$(DSTDIR)/%.pyc,$(MODULES))
+PYFILES  := $(patsubst %,$(DSTDIR)/%.py,$(MODULES) __init__ ctypes_preamble ctypes_loader)
+PYCFILES  := $(patsubst %,$(DSTDIR)/%.pyc,$(MODULES) __init__ ctypes_preamble ctypes_loader)
 LPYFILES := $(patsubst %,$(OBJDIR)/%.py,$(MODULES))
 
-COPY_FILES = $(DSTDIR)/ctypes_loader.py $(DSTDIR)/ctypes_preamble.py
+COPY_FILES = $(DSTDIR)/ctypes_loader.py $(DSTDIR)/ctypes_preamble.py $(DSTDIR)/__init__.py
 
 ifeq ($(strip $(GRASS_LIBRARY_TYPE)),shlib)
 default: $(COPY_FILES)
@@ -96,6 +96,8 @@ $(DSTDIR)/ctypes_loader.py: ctypesgen/libraryloader.py
 	cp -f $< $@
 $(DSTDIR)/ctypes_preamble.py: ctypesgen/printer_python/preamble/3_2.py
 	cp -f $< $@
+$(DSTDIR)/__init__.py: libgrass__init__.py
+	cp -f $< $@
 
 $(DSTDIR)/%.py: $(OBJDIR)/%.py | $(DSTDIR)
 	$(INSTALL_DATA) $< $@

+ 1 - 1
python/grass/ctypes/README.md

@@ -6,7 +6,7 @@ https://github.com/ctypesgen/ctypesgen/commit/0681f8ef1742206c171d44b7872c700f34
 
 ### How to update ctypesgen version
 
-1. Replace the GRASS directory `python/grass/ctypes/ctypesgen` with the `ctypesgen`
+1. Replace the GRASS directory `python/libgrass_interface_generator/ctypesgen` with the `ctypesgen`
    directory from ctypesgen source directory.
 2. Replace `python/grass/ctypes/run.py` with `run.py` from ctypesgen source directory.
 3. Apply the patches below.

python/grass/ctypes/ctypesgen/LICENSE → python/libgrass_interface_generator/ctypesgen/LICENSE


python/grass/ctypes/ctypesgen/__init__.py → python/libgrass_interface_generator/ctypesgen/__init__.py


python/grass/ctypes/ctypesgen/ctypedescs.py → python/libgrass_interface_generator/ctypesgen/ctypedescs.py


python/grass/ctypes/ctypesgen/descriptions.py → python/libgrass_interface_generator/ctypesgen/descriptions.py


python/grass/ctypes/ctypesgen/expressions.py → python/libgrass_interface_generator/ctypesgen/expressions.py


python/grass/ctypes/ctypesgen/libraryloader.py → python/libgrass_interface_generator/ctypesgen/libraryloader.py


python/grass/ctypes/ctypesgen/main.py → python/libgrass_interface_generator/ctypesgen/main.py


python/grass/ctypes/ctypesgen/messages.py → python/libgrass_interface_generator/ctypesgen/messages.py


python/grass/ctypes/ctypesgen/options.py → python/libgrass_interface_generator/ctypesgen/options.py


python/grass/ctypes/ctypesgen/parser/.gitignore → python/libgrass_interface_generator/ctypesgen/parser/.gitignore


python/grass/ctypes/ctypesgen/parser/__init__.py → python/libgrass_interface_generator/ctypesgen/parser/__init__.py


python/grass/ctypes/ctypesgen/parser/cdeclarations.py → python/libgrass_interface_generator/ctypesgen/parser/cdeclarations.py


python/grass/ctypes/ctypesgen/parser/cgrammar.py → python/libgrass_interface_generator/ctypesgen/parser/cgrammar.py


python/grass/ctypes/ctypesgen/parser/cparser.py → python/libgrass_interface_generator/ctypesgen/parser/cparser.py


python/grass/ctypes/ctypesgen/parser/ctypesparser.py → python/libgrass_interface_generator/ctypesgen/parser/ctypesparser.py


python/grass/ctypes/ctypesgen/parser/datacollectingparser.py → python/libgrass_interface_generator/ctypesgen/parser/datacollectingparser.py


python/grass/ctypes/ctypesgen/parser/lex.py → python/libgrass_interface_generator/ctypesgen/parser/lex.py


python/grass/ctypes/ctypesgen/parser/lextab.py → python/libgrass_interface_generator/ctypesgen/parser/lextab.py


python/grass/ctypes/ctypesgen/parser/parsetab.py → python/libgrass_interface_generator/ctypesgen/parser/parsetab.py


python/grass/ctypes/ctypesgen/parser/pplexer.py → python/libgrass_interface_generator/ctypesgen/parser/pplexer.py


python/grass/ctypes/ctypesgen/parser/preprocessor.py → python/libgrass_interface_generator/ctypesgen/parser/preprocessor.py


python/grass/ctypes/ctypesgen/parser/yacc.py → python/libgrass_interface_generator/ctypesgen/parser/yacc.py


python/grass/ctypes/ctypesgen/printer_json/__init__.py → python/libgrass_interface_generator/ctypesgen/printer_json/__init__.py


python/grass/ctypes/ctypesgen/printer_json/printer.py → python/libgrass_interface_generator/ctypesgen/printer_json/printer.py


python/grass/ctypes/ctypesgen/printer_json/test.py → python/libgrass_interface_generator/ctypesgen/printer_json/test.py


python/grass/ctypes/ctypesgen/printer_python/__init__.py → python/libgrass_interface_generator/ctypesgen/printer_python/__init__.py


python/grass/ctypes/ctypesgen/printer_python/defaultheader.py → python/libgrass_interface_generator/ctypesgen/printer_python/defaultheader.py


python/grass/ctypes/ctypesgen/printer_python/preamble/2_5.py → python/libgrass_interface_generator/ctypesgen/printer_python/preamble/2_5.py


python/grass/ctypes/ctypesgen/printer_python/preamble/2_7.py → python/libgrass_interface_generator/ctypesgen/printer_python/preamble/2_7.py


python/grass/ctypes/ctypesgen/printer_python/preamble/3_2.py → python/libgrass_interface_generator/ctypesgen/printer_python/preamble/3_2.py


python/grass/ctypes/ctypesgen/printer_python/preamble/__init__.py → python/libgrass_interface_generator/ctypesgen/printer_python/preamble/__init__.py


python/grass/ctypes/ctypesgen/printer_python/printer.py → python/libgrass_interface_generator/ctypesgen/printer_python/printer.py


python/grass/ctypes/ctypesgen/printer_python/test.py → python/libgrass_interface_generator/ctypesgen/printer_python/test.py


python/grass/ctypes/ctypesgen/processor/__init__.py → python/libgrass_interface_generator/ctypesgen/processor/__init__.py


python/grass/ctypes/ctypesgen/processor/dependencies.py → python/libgrass_interface_generator/ctypesgen/processor/dependencies.py


python/grass/ctypes/ctypesgen/processor/operations.py → python/libgrass_interface_generator/ctypesgen/processor/operations.py


python/grass/ctypes/ctypesgen/processor/pipeline.py → python/libgrass_interface_generator/ctypesgen/processor/pipeline.py


python/grass/ctypes/ctypesgen/test/.gitignore → python/libgrass_interface_generator/ctypesgen/test/.gitignore


python/grass/ctypes/ctypesgen/test/ctypesgentest.py → python/libgrass_interface_generator/ctypesgen/test/ctypesgentest.py


python/grass/ctypes/ctypesgen/test/testsuite.py → python/libgrass_interface_generator/ctypesgen/test/testsuite.py


python/grass/ctypes/ctypesgen/version.py → python/libgrass_interface_generator/ctypesgen/version.py


python/grass/ctypes/__init__.py → python/libgrass_interface_generator/libgrass__init__.py


python/grass/ctypes/run.py → python/libgrass_interface_generator/run.py