Remove __init__.py files (#1275)

Since we're implementing a plugin system that relies on implicit
namespacing, we should remove these files so that they don't confuse and
muddle our virtual envs (like the ones we use to run tests).

Also, they're not longer needed as of Python 3.3.

PEP 420 says:
Allowing implicit namespace packages means that the requirement to
provide an __init__.py file can be dropped completely...

features/steps/core.py

@@ -18,7 +18,7 @@ import yaml
 from yaml.loader import SafeLoader
 
 from jrnl import Journal
-from jrnl import __version__
+from jrnl.__version__ import __version__
 from jrnl import plugins
 from jrnl.args import parse_args
 from jrnl.behave_testing import _mock_getpass

jrnl/DayOneJournal.py

@@ -15,8 +15,7 @@ import tzlocal
 
 from . import Entry
 from . import Journal
-from . import __title__
+from jrnl.__version__ import __version__
-from . import __version__
 
 
 class DayOne(Journal.Journal):
@@ -133,9 +132,7 @@ class DayOne(Journal.Journal):
                         platform.system(), platform.release()
                     )
                 if not hasattr(entry, "creator_software_agent"):
-                    entry.creator_software_agent = "{}/{}".format(
+                    entry.creator_software_agent = "jrnl/{}".format(__version__)
-                        __title__, __version__
-                    )
 
                 fn = (
                     Path(self.config["journal"])

jrnl/__init__.py

@@ -1,8 +0,0 @@
-# Copyright (C) 2012-2021 jrnl contributors
-# License: https://www.gnu.org/licenses/gpl-3.0.html
-
-try:
-    from .__version__ import __version__
-except ImportError:
-    __version__ = "source"
-__title__ = "jrnl"

jrnl/__main__.py

@@ -1,9 +0,0 @@
-# Copyright (C) 2012-2021 jrnl contributors
-# License: https://www.gnu.org/licenses/gpl-3.0.html
-
-import sys
-
-from .cli import cli
-
-if __name__ == "__main__":
-    sys.exit(cli())

jrnl/commands.py

@@ -16,7 +16,7 @@ import sys
 
 
 def preconfig_diagnostic(_):
-    from jrnl import __version__
+    from jrnl.__version__ import __version__
 
     print(
         f"jrnl: {__version__}\n"
@@ -26,8 +26,7 @@ def preconfig_diagnostic(_):
 
 
 def preconfig_version(_):
-    from jrnl import __title__
+    from jrnl.__version__ import __version__
-    from jrnl import __version__
     from jrnl.plugins.collector import (
         IMPORT_FORMATS,
         EXPORT_FORMATS,
@@ -35,7 +34,7 @@ def preconfig_version(_):
         get_importer,
     )
 
-    version_str = f"""{__title__} version {__version__}
+    version_str = f"""jrnl version {__version__}
 
 Copyright (C) 2012-2021 jrnl contributors
 

jrnl/config.py

@@ -6,7 +6,7 @@ import colorama
 import yaml
 import xdg.BaseDirectory
 
-from . import __version__
+from jrnl.__version__ import __version__
 from .exception import JrnlError
 from .color import ERROR_COLOR
 from .color import RESET_COLOR

jrnl/plugins/__init__.py

@@ -1,4 +0,0 @@
-# encoding: utf-8
-
-# Copyright (C) 2012-2021 jrnl contributors
-# License: https://www.gnu.org/licenses/gpl-3.0.html

jrnl/plugins/exporter/dates.py

@@ -6,7 +6,7 @@ from collections import Counter
 
 from jrnl.plugins.base import BaseExporter
 
-from ... import __version__
+from jrnl.__version__ import __version__
 
 
 class Exporter(BaseExporter):

jrnl/plugins/exporter/fancy.py

@@ -8,7 +8,7 @@ from textwrap import TextWrapper
 from jrnl.plugins.base import BaseExporter
 from jrnl.plugins.util import check_provided_linewrap_viability
 
-from ... import __version__
+from jrnl.__version__ import __version__
 
 
 class Exporter(BaseExporter):

jrnl/plugins/exporter/json.py

@@ -7,7 +7,7 @@ import json
 from jrnl.plugins.base import BaseExporter
 from jrnl.plugins.util import get_tags_count
 
-from ... import __version__
+from jrnl.__version__ import __version__
 
 
 class Exporter(BaseExporter):

jrnl/plugins/exporter/markdown.py

@@ -10,7 +10,7 @@ from jrnl.color import RESET_COLOR
 from jrnl.color import WARNING_COLOR
 from jrnl.plugins.base import BaseExporter
 
-from ... import __version__
+from jrnl.__version__ import __version__
 
 
 class Exporter(BaseExporter):

jrnl/plugins/exporter/pretty.py

@@ -5,7 +5,7 @@
 
 from jrnl.plugins.base import BaseExporter
 
-from ... import __version__
+from jrnl.__version__ import __version__
 
 
 class Exporter(BaseExporter):

jrnl/plugins/exporter/short.py

@@ -5,7 +5,7 @@
 
 from jrnl.plugins.base import BaseExporter
 
-from ... import __version__
+from jrnl.__version__ import __version__
 
 
 class Exporter(BaseExporter):

jrnl/plugins/exporter/tag.py

@@ -6,7 +6,7 @@
 from jrnl.plugins.base import BaseExporter
 from jrnl.plugins.util import get_tags_count
 
-from ... import __version__
+from jrnl.__version__ import __version__
 
 
 class Exporter(BaseExporter):

jrnl/plugins/exporter/text.py

@@ -5,7 +5,7 @@
 
 from jrnl.plugins.base import BaseExporter
 
-from ... import __version__
+from jrnl.__version__ import __version__
 
 
 class Exporter(BaseExporter):

jrnl/plugins/exporter/xml.py

@@ -7,7 +7,7 @@ from xml.dom import minidom
 from jrnl.plugins.base import BaseExporter
 from jrnl.plugins.util import get_tags_count
 
-from ... import __version__
+from jrnl.__version__ import __version__
 
 
 class Exporter(BaseExporter):

jrnl/plugins/exporter/yaml.py

@@ -11,7 +11,7 @@ from jrnl.color import RESET_COLOR
 from jrnl.color import WARNING_COLOR
 from jrnl.plugins.base import BaseExporter
 
-from ... import __version__
+from jrnl.__version__ import __version__
 
 
 class Exporter(BaseExporter):

jrnl/plugins/importer/jrnl.py

@@ -6,7 +6,7 @@ import sys
 
 from jrnl.plugins.base import BaseImporter
 
-from ... import __version__
+from jrnl.__version__ import __version__
 
 
 class Importer(BaseImporter):

jrnl/upgrade.py

@@ -5,7 +5,7 @@ import os
 import sys
 
 from . import Journal
-from . import __version__
+from jrnl.__version__ import __version__
 from .EncryptedJournal import EncryptedJournal
 from .config import is_config_json
 from .config import load_config