Move from flat layout to src layout

akosthekiss · Dec 18, 2024 · 9025349 · 9025349
1 parent f754771
commit 9025349
Show file tree

Hide file tree

Showing 29 changed files with 13 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,4 +12,4 @@ dist
 .coverage*
 *.interp
 *.tokens
-picireny/antlr4/parser/ANTLRv4*.py
+src/picireny/antlr4/parser/ANTLRv4*.py
diff --git a/LICENSE.rst b/LICENSE.rst
@@ -36,5 +36,5 @@ Copyright (c) 2007 Ghassan Misherghi.
 -----
 
 This software includes components from the "Grammars written for ANTLR v4"
-project under picireny/antlr4/resources and picireny/antlr4/parser, which files
-carry a compatible "BSD license" and their own copyright notices.
+project under src/picireny/antlr4/resources and src/picireny/antlr4/parser,
+which files carry a compatible "BSD license" and their own copyright notices.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1 +1 @@
-exclude picireny/antlr4/parser/ANTLRv4*.py
+exclude src/picireny/antlr4/parser/ANTLRv4*.py
diff --git a/setup.cfg b/setup.cfg
@@ -24,6 +24,8 @@ classifiers =
 platform = any
 
 [options]
+package_dir =
+    = src
 packages = find:
 include_package_data = True
 python_requires = >=3.8
@@ -34,12 +36,15 @@ install_requires =
     picire==21.8
     xson
 
+[options.packages.find]
+where = src
+
 [options.entry_points]
 console_scripts =
     picireny = picireny.cli:execute
 
 [build_antlr]
 commands =
-    antlerinator:4.13.2 picireny/antlr4/resources/ANTLRv4Lexer.g4 picireny/antlr4/resources/ANTLRv4Parser.g4 -Dlanguage=Python3 -o picireny/antlr4/parser -Xexact-output-dir -no-listener
+    antlerinator:4.13.2 src/picireny/antlr4/resources/ANTLRv4Lexer.g4 src/picireny/antlr4/resources/ANTLRv4Parser.g4 -Dlanguage=Python3 -o src/picireny/antlr4/parser -Xexact-output-dir -no-listener
 output =
-    picireny/antlr4/parser/ANTLRv4*.py
+    src/picireny/antlr4/parser/ANTLRv4*.py
diff --git a/picireny/__init__.py → src/picireny/__init__.py b/picireny/__init__.py → src/picireny/__init__.py
diff --git a/picireny/__main__.py → src/picireny/__main__.py b/picireny/__main__.py → src/picireny/__main__.py
diff --git a/picireny/antlr4/__init__.py → src/picireny/antlr4/__init__.py b/picireny/antlr4/__init__.py → src/picireny/antlr4/__init__.py
diff --git a/picireny/antlr4/antlr_tree.py → src/picireny/antlr4/antlr_tree.py b/picireny/antlr4/antlr_tree.py → src/picireny/antlr4/antlr_tree.py
diff --git a/picireny/antlr4/grammar_analyzer.py → src/picireny/antlr4/grammar_analyzer.py b/picireny/antlr4/grammar_analyzer.py → src/picireny/antlr4/grammar_analyzer.py
diff --git a/picireny/antlr4/hdd_tree_builder.py → src/picireny/antlr4/hdd_tree_builder.py b/picireny/antlr4/hdd_tree_builder.py → src/picireny/antlr4/hdd_tree_builder.py
diff --git a/picireny/antlr4/parser/LexerAdaptor.py → src/picireny/antlr4/parser/LexerAdaptor.py b/picireny/antlr4/parser/LexerAdaptor.py → src/picireny/antlr4/parser/LexerAdaptor.py
diff --git a/picireny/antlr4/parser/__init__.py → src/picireny/antlr4/parser/__init__.py b/picireny/antlr4/parser/__init__.py → src/picireny/antlr4/parser/__init__.py
diff --git a/picireny/antlr4/parser_builder.py → src/picireny/antlr4/parser_builder.py b/picireny/antlr4/parser_builder.py → src/picireny/antlr4/parser_builder.py
diff --git a/picireny/antlr4/resources/ANTLRv4Lexer.g4 → ...picireny/antlr4/resources/ANTLRv4Lexer.g4 b/picireny/antlr4/resources/ANTLRv4Lexer.g4 → ...picireny/antlr4/resources/ANTLRv4Lexer.g4
diff --git a/picireny/antlr4/resources/ANTLRv4Parser.g4 → ...icireny/antlr4/resources/ANTLRv4Parser.g4 b/picireny/antlr4/resources/ANTLRv4Parser.g4 → ...icireny/antlr4/resources/ANTLRv4Parser.g4
diff --git a/...ntlr4/resources/ExtendedTargetParser.java → ...ntlr4/resources/ExtendedTargetParser.java b/...ntlr4/resources/ExtendedTargetParser.java → ...ntlr4/resources/ExtendedTargetParser.java
diff --git a/picireny/antlr4/resources/LexBasic.g4 → src/picireny/antlr4/resources/LexBasic.g4 b/picireny/antlr4/resources/LexBasic.g4 → src/picireny/antlr4/resources/LexBasic.g4
diff --git a/picireny/cli.py → src/picireny/cli.py b/picireny/cli.py → src/picireny/cli.py
diff --git a/picireny/filter.py → src/picireny/filter.py b/picireny/filter.py → src/picireny/filter.py
diff --git a/picireny/hdd.py → src/picireny/hdd.py b/picireny/hdd.py → src/picireny/hdd.py
diff --git a/picireny/hdd_tree.py → src/picireny/hdd_tree.py b/picireny/hdd_tree.py → src/picireny/hdd_tree.py
diff --git a/picireny/hddr.py → src/picireny/hddr.py b/picireny/hddr.py → src/picireny/hddr.py
diff --git a/picireny/hoist.py → src/picireny/hoist.py b/picireny/hoist.py → src/picireny/hoist.py
diff --git a/picireny/info.py → src/picireny/info.py b/picireny/info.py → src/picireny/info.py
diff --git a/picireny/prune.py → src/picireny/prune.py b/picireny/prune.py → src/picireny/prune.py
diff --git a/picireny/srcml/__init__.py → src/picireny/srcml/__init__.py b/picireny/srcml/__init__.py → src/picireny/srcml/__init__.py
diff --git a/picireny/srcml/hdd_tree_builder.py → src/picireny/srcml/hdd_tree_builder.py b/picireny/srcml/hdd_tree_builder.py → src/picireny/srcml/hdd_tree_builder.py
diff --git a/picireny/transform.py → src/picireny/transform.py b/picireny/transform.py → src/picireny/transform.py
diff --git a/tox.ini b/tox.ini
@@ -22,8 +22,8 @@ deps =
     pylint
     pytest
 commands =
-    pylint picireny tests
-    pycodestyle picireny tests --ignore=E501 --exclude=picireny/antlr4/parser/ANTLRv4*.py
+    pylint src/picireny tests
+    pycodestyle src/picireny tests --ignore=E501 --exclude=src/picireny/antlr4/parser/ANTLRv4*.py
 
 [testenv:build]
 deps =
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		exclude picireny/antlr4/parser/ANTLRv4*.py
		exclude src/picireny/antlr4/parser/ANTLRv4*.py