Move mwparserfromhell to src/ dir

earwig · Jan 4, 2021 · 297bcb0 · 297bcb0
1 parent 074e368
commit 297bcb0
Show file tree

Hide file tree

Showing 53 changed files with 24 additions and 20 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,7 +1,8 @@
 v0.7 (unreleased):
 
-- Port tests to pytest. (#237)
-- Improve parsing of external links. (#232)
+- Improved parsing of external links. (#232)
+- Ported tests to pytest. (#237)
+- Moved mwparserfromhell package to src/ dir.
 
 v0.6 (released December 21, 2020):
 

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,3 +1,3 @@
 include LICENSE CHANGELOG
-recursive-include mwparserfromhell *.h
+recursive-include src *.h
 recursive-include tests *.py *.mwtest
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -7,10 +7,11 @@ v0.7
 Unreleased
 (`changes <https://github.com/earwig/mwparserfromhell/compare/v0.6...develop>`__):
 
-- Port tests to pytest.
-  (`#237 <https://github.com/earwig/mwparserfromhell/issues/237>`_)
-- Improve parsing of external links.
+- Improved parsing of external links.
   (`#232 <https://github.com/earwig/mwparserfromhell/issues/232>`_)
+- Ported tests to pytest.
+  (`#237 <https://github.com/earwig/mwparserfromhell/issues/237>`_)
+- Moved mwparserfromhell package to src/ dir.
 
 v0.6
 ----

diff --git a/docs/conf.py b/docs/conf.py
@@ -42,7 +42,7 @@
 
 # General information about the project.
 project = u'mwparserfromhell'
-copyright = u'2012–2020 Ben Kurtovic'
+copyright = u'2012–2021 Ben Kurtovic'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

diff --git a/setup.py b/setup.py
@@ -20,14 +20,15 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from distutils.errors import DistutilsError, CCompilerError
 from glob import glob
-from os import environ
+import os
 import sys
 
-from setuptools import setup, find_packages, Extension
+from setuptools import setup, Extension
 from setuptools.command.build_ext import build_ext
 
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src"))
+
 from mwparserfromhell import __version__
 
 with open("README.rst") as fp:
@@ -38,7 +39,7 @@
 
 # Allow env var WITHOUT_EXTENSION and args --with[out]-extension:
 
-env_var = environ.get("WITHOUT_EXTENSION")
+env_var = os.environ.get("WITHOUT_EXTENSION")
 if "--without-extension" in sys.argv:
     use_extension = False
 elif "--with-extension" in sys.argv:
@@ -52,12 +53,12 @@
 # Remove the command line argument as it isn't understood by setuptools:
 
 sys.argv = [arg for arg in sys.argv
-            if arg != "--without-extension" and arg != "--with-extension"]
+            if arg not in ("--without-extension", "--with-extension")]
 
 def build_ext_patched(self):
     try:
         build_ext_original(self)
-    except (DistutilsError, CCompilerError) as exc:
+    except Exception as exc:
         print("error: " + str(exc))
         print("Falling back to pure Python mode.")
         del self.extensions[:]
@@ -68,14 +69,15 @@ def build_ext_patched(self):
 # Project-specific part begins here:
 
 tokenizer = Extension("mwparserfromhell.parser._tokenizer",
-                      sources=sorted(glob("mwparserfromhell/parser/ctokenizer/*.c")),
-                      depends=sorted(glob("mwparserfromhell/parser/ctokenizer/*.h")))
+                      sources=sorted(glob("src/mwparserfromhell/parser/ctokenizer/*.c")),
+                      depends=sorted(glob("src/mwparserfromhell/parser/ctokenizer/*.h")))
 
 setup(
     name = "mwparserfromhell",
-    packages = find_packages(exclude=("tests",)),
+    packages = ["mwparserfromhell"],
+    package_dir = {"": "src"},
     ext_modules = [tokenizer] if use_extension else [],
-    test_requires = ["pytest"],
+    tests_require = ["pytest"],
     version = __version__,
     python_requires = ">= 3.5",
     author = "Ben Kurtovic",

diff --git a/mwparserfromhell/__init__.py → src/mwparserfromhell/__init__.py b/mwparserfromhell/__init__.py → src/mwparserfromhell/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2020 Ben Kurtovic <[email protected]>
+# Copyright (C) 2012-2021 Ben Kurtovic <[email protected]>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,7 @@
 """
 
 __author__ = "Ben Kurtovic"
-__copyright__ = "Copyright (C) 2012-2020 Ben Kurtovic"
+__copyright__ = "Copyright (C) 2012-2021 Ben Kurtovic"
 __license__ = "MIT License"
 __version__ = "0.7.dev0"
 __email__ = "[email protected]"

diff --git a/mwparserfromhell/definitions.py → src/mwparserfromhell/definitions.py b/mwparserfromhell/definitions.py → src/mwparserfromhell/definitions.py
diff --git a/mwparserfromhell/nodes/__init__.py → src/mwparserfromhell/nodes/__init__.py b/mwparserfromhell/nodes/__init__.py → src/mwparserfromhell/nodes/__init__.py
diff --git a/mwparserfromhell/nodes/_base.py → src/mwparserfromhell/nodes/_base.py b/mwparserfromhell/nodes/_base.py → src/mwparserfromhell/nodes/_base.py
diff --git a/mwparserfromhell/nodes/argument.py → src/mwparserfromhell/nodes/argument.py b/mwparserfromhell/nodes/argument.py → src/mwparserfromhell/nodes/argument.py
diff --git a/mwparserfromhell/nodes/comment.py → src/mwparserfromhell/nodes/comment.py b/mwparserfromhell/nodes/comment.py → src/mwparserfromhell/nodes/comment.py
diff --git a/mwparserfromhell/nodes/external_link.py → src/mwparserfromhell/nodes/external_link.py b/mwparserfromhell/nodes/external_link.py → src/mwparserfromhell/nodes/external_link.py
diff --git a/mwparserfromhell/nodes/extras/__init__.py → ...mwparserfromhell/nodes/extras/__init__.py b/mwparserfromhell/nodes/extras/__init__.py → ...mwparserfromhell/nodes/extras/__init__.py
diff --git a/mwparserfromhell/nodes/extras/attribute.py → ...wparserfromhell/nodes/extras/attribute.py b/mwparserfromhell/nodes/extras/attribute.py → ...wparserfromhell/nodes/extras/attribute.py
diff --git a/mwparserfromhell/nodes/extras/parameter.py → ...wparserfromhell/nodes/extras/parameter.py b/mwparserfromhell/nodes/extras/parameter.py → ...wparserfromhell/nodes/extras/parameter.py
diff --git a/mwparserfromhell/nodes/heading.py → src/mwparserfromhell/nodes/heading.py b/mwparserfromhell/nodes/heading.py → src/mwparserfromhell/nodes/heading.py
diff --git a/mwparserfromhell/nodes/html_entity.py → src/mwparserfromhell/nodes/html_entity.py b/mwparserfromhell/nodes/html_entity.py → src/mwparserfromhell/nodes/html_entity.py
diff --git a/mwparserfromhell/nodes/tag.py → src/mwparserfromhell/nodes/tag.py b/mwparserfromhell/nodes/tag.py → src/mwparserfromhell/nodes/tag.py
diff --git a/mwparserfromhell/nodes/template.py → src/mwparserfromhell/nodes/template.py b/mwparserfromhell/nodes/template.py → src/mwparserfromhell/nodes/template.py
diff --git a/mwparserfromhell/nodes/text.py → src/mwparserfromhell/nodes/text.py b/mwparserfromhell/nodes/text.py → src/mwparserfromhell/nodes/text.py
diff --git a/mwparserfromhell/nodes/wikilink.py → src/mwparserfromhell/nodes/wikilink.py b/mwparserfromhell/nodes/wikilink.py → src/mwparserfromhell/nodes/wikilink.py
diff --git a/mwparserfromhell/parser/__init__.py → src/mwparserfromhell/parser/__init__.py b/mwparserfromhell/parser/__init__.py → src/mwparserfromhell/parser/__init__.py
diff --git a/mwparserfromhell/parser/builder.py → src/mwparserfromhell/parser/builder.py b/mwparserfromhell/parser/builder.py → src/mwparserfromhell/parser/builder.py
diff --git a/mwparserfromhell/parser/contexts.py → src/mwparserfromhell/parser/contexts.py b/mwparserfromhell/parser/contexts.py → src/mwparserfromhell/parser/contexts.py
diff --git a/...rserfromhell/parser/ctokenizer/avl_tree.c → ...rserfromhell/parser/ctokenizer/avl_tree.c b/...rserfromhell/parser/ctokenizer/avl_tree.c → ...rserfromhell/parser/ctokenizer/avl_tree.c
diff --git a/...rserfromhell/parser/ctokenizer/avl_tree.h → ...rserfromhell/parser/ctokenizer/avl_tree.h b/...rserfromhell/parser/ctokenizer/avl_tree.h → ...rserfromhell/parser/ctokenizer/avl_tree.h
diff --git a/mwparserfromhell/parser/ctokenizer/common.h → ...parserfromhell/parser/ctokenizer/common.h b/mwparserfromhell/parser/ctokenizer/common.h → ...parserfromhell/parser/ctokenizer/common.h
diff --git a/...rserfromhell/parser/ctokenizer/contexts.h → ...rserfromhell/parser/ctokenizer/contexts.h b/...rserfromhell/parser/ctokenizer/contexts.h → ...rserfromhell/parser/ctokenizer/contexts.h
diff --git a/...rfromhell/parser/ctokenizer/definitions.c → ...rfromhell/parser/ctokenizer/definitions.c b/...rfromhell/parser/ctokenizer/definitions.c → ...rfromhell/parser/ctokenizer/definitions.c
diff --git a/...rfromhell/parser/ctokenizer/definitions.h → ...rfromhell/parser/ctokenizer/definitions.h b/...rfromhell/parser/ctokenizer/definitions.h → ...rfromhell/parser/ctokenizer/definitions.h
diff --git a/...rserfromhell/parser/ctokenizer/tag_data.c → ...rserfromhell/parser/ctokenizer/tag_data.c b/...rserfromhell/parser/ctokenizer/tag_data.c → ...rserfromhell/parser/ctokenizer/tag_data.c
diff --git a/...rserfromhell/parser/ctokenizer/tag_data.h → ...rserfromhell/parser/ctokenizer/tag_data.h b/...rserfromhell/parser/ctokenizer/tag_data.h → ...rserfromhell/parser/ctokenizer/tag_data.h
diff --git a/...erfromhell/parser/ctokenizer/textbuffer.c → ...erfromhell/parser/ctokenizer/textbuffer.c b/...erfromhell/parser/ctokenizer/textbuffer.c → ...erfromhell/parser/ctokenizer/textbuffer.c
diff --git a/...erfromhell/parser/ctokenizer/textbuffer.h → ...erfromhell/parser/ctokenizer/textbuffer.h b/...erfromhell/parser/ctokenizer/textbuffer.h → ...erfromhell/parser/ctokenizer/textbuffer.h
diff --git a/...serfromhell/parser/ctokenizer/tok_parse.c → ...serfromhell/parser/ctokenizer/tok_parse.c b/...serfromhell/parser/ctokenizer/tok_parse.c → ...serfromhell/parser/ctokenizer/tok_parse.c
diff --git a/...serfromhell/parser/ctokenizer/tok_parse.h → ...serfromhell/parser/ctokenizer/tok_parse.h b/...serfromhell/parser/ctokenizer/tok_parse.h → ...serfromhell/parser/ctokenizer/tok_parse.h
diff --git a/...rfromhell/parser/ctokenizer/tok_support.c → ...rfromhell/parser/ctokenizer/tok_support.c b/...rfromhell/parser/ctokenizer/tok_support.c → ...rfromhell/parser/ctokenizer/tok_support.c
diff --git a/...rfromhell/parser/ctokenizer/tok_support.h → ...rfromhell/parser/ctokenizer/tok_support.h b/...rfromhell/parser/ctokenizer/tok_support.h → ...rfromhell/parser/ctokenizer/tok_support.h
diff --git a/...serfromhell/parser/ctokenizer/tokenizer.c → ...serfromhell/parser/ctokenizer/tokenizer.c b/...serfromhell/parser/ctokenizer/tokenizer.c → ...serfromhell/parser/ctokenizer/tokenizer.c
diff --git a/...serfromhell/parser/ctokenizer/tokenizer.h → ...serfromhell/parser/ctokenizer/tokenizer.h b/...serfromhell/parser/ctokenizer/tokenizer.h → ...serfromhell/parser/ctokenizer/tokenizer.h
diff --git a/mwparserfromhell/parser/ctokenizer/tokens.c → ...parserfromhell/parser/ctokenizer/tokens.c b/mwparserfromhell/parser/ctokenizer/tokens.c → ...parserfromhell/parser/ctokenizer/tokens.c
diff --git a/mwparserfromhell/parser/ctokenizer/tokens.h → ...parserfromhell/parser/ctokenizer/tokens.h b/mwparserfromhell/parser/ctokenizer/tokens.h → ...parserfromhell/parser/ctokenizer/tokens.h
diff --git a/mwparserfromhell/parser/errors.py → src/mwparserfromhell/parser/errors.py b/mwparserfromhell/parser/errors.py → src/mwparserfromhell/parser/errors.py
diff --git a/mwparserfromhell/parser/tokenizer.py → src/mwparserfromhell/parser/tokenizer.py b/mwparserfromhell/parser/tokenizer.py → src/mwparserfromhell/parser/tokenizer.py
diff --git a/mwparserfromhell/parser/tokens.py → src/mwparserfromhell/parser/tokens.py b/mwparserfromhell/parser/tokens.py → src/mwparserfromhell/parser/tokens.py
diff --git a/mwparserfromhell/smart_list/__init__.py → src/mwparserfromhell/smart_list/__init__.py b/mwparserfromhell/smart_list/__init__.py → src/mwparserfromhell/smart_list/__init__.py
diff --git a/mwparserfromhell/smart_list/list_proxy.py → ...mwparserfromhell/smart_list/list_proxy.py b/mwparserfromhell/smart_list/list_proxy.py → ...mwparserfromhell/smart_list/list_proxy.py
diff --git a/mwparserfromhell/smart_list/smart_list.py → ...mwparserfromhell/smart_list/smart_list.py b/mwparserfromhell/smart_list/smart_list.py → ...mwparserfromhell/smart_list/smart_list.py
diff --git a/mwparserfromhell/smart_list/utils.py → src/mwparserfromhell/smart_list/utils.py b/mwparserfromhell/smart_list/utils.py → src/mwparserfromhell/smart_list/utils.py
diff --git a/mwparserfromhell/string_mixin.py → src/mwparserfromhell/string_mixin.py b/mwparserfromhell/string_mixin.py → src/mwparserfromhell/string_mixin.py
diff --git a/mwparserfromhell/utils.py → src/mwparserfromhell/utils.py b/mwparserfromhell/utils.py → src/mwparserfromhell/utils.py
diff --git a/mwparserfromhell/wikicode.py → src/mwparserfromhell/wikicode.py b/mwparserfromhell/wikicode.py → src/mwparserfromhell/wikicode.py
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2020 Ben Kurtovic <[email protected]>
+# Copyright (C) 2012-2021 Ben Kurtovic <[email protected]>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal