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...
jrnl-org · Jul 17, 2021 · be1da17 · be1da17
1 parent 4392e29
commit be1da17
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 44 deletions.
diff --git a/features/steps/core.py b/features/steps/core.py
@@ -18,7 +18,7 @@
 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

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

diff --git a/jrnl/__init__.py b/jrnl/__init__.py
diff --git a/jrnl/__main__.py b/jrnl/__main__.py
diff --git a/jrnl/commands.py b/jrnl/commands.py
@@ -16,7 +16,7 @@
 
 
 def preconfig_diagnostic(_):
-    from jrnl import __version__
+    from jrnl.__version__ import __version__
 
     print(
         f"jrnl: {__version__}\n"
@@ -26,16 +26,15 @@ def preconfig_diagnostic(_):
 
 
 def preconfig_version(_):
-    from jrnl import __title__
-    from jrnl import __version__
+    from jrnl.__version__ import __version__
     from jrnl.plugins.collector import (
         IMPORT_FORMATS,
         EXPORT_FORMATS,
         get_exporter,
         get_importer,
     )
 
-    version_str = f"""{__title__} version {__version__}
+    version_str = f"""jrnl version {__version__}
 
 Copyright (C) 2012-2021 jrnl contributors
 

diff --git a/jrnl/config.py b/jrnl/config.py
@@ -6,7 +6,7 @@
 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

diff --git a/jrnl/plugins/__init__.py b/jrnl/plugins/__init__.py
diff --git a/jrnl/plugins/exporter/dates.py b/jrnl/plugins/exporter/dates.py
@@ -6,7 +6,7 @@
 
 from jrnl.plugins.base import BaseExporter
 
-from ... import __version__
+from jrnl.__version__ import __version__
 
 
 class Exporter(BaseExporter):

diff --git a/jrnl/plugins/exporter/fancy.py b/jrnl/plugins/exporter/fancy.py
@@ -8,7 +8,7 @@
 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):

diff --git a/jrnl/plugins/exporter/json.py b/jrnl/plugins/exporter/json.py
@@ -7,7 +7,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):

diff --git a/jrnl/plugins/exporter/markdown.py b/jrnl/plugins/exporter/markdown.py
@@ -10,7 +10,7 @@
 from jrnl.color import WARNING_COLOR
 from jrnl.plugins.base import BaseExporter
 
-from ... import __version__
+from jrnl.__version__ import __version__
 
 
 class Exporter(BaseExporter):

diff --git a/jrnl/plugins/exporter/pretty.py b/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):

diff --git a/jrnl/plugins/exporter/short.py b/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):

diff --git a/jrnl/plugins/exporter/tag.py b/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):

diff --git a/jrnl/plugins/exporter/text.py b/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):

diff --git a/jrnl/plugins/exporter/xml.py b/jrnl/plugins/exporter/xml.py
@@ -7,7 +7,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):

diff --git a/jrnl/plugins/exporter/yaml.py b/jrnl/plugins/exporter/yaml.py
@@ -11,7 +11,7 @@
 from jrnl.color import WARNING_COLOR
 from jrnl.plugins.base import BaseExporter
 
-from ... import __version__
+from jrnl.__version__ import __version__
 
 
 class Exporter(BaseExporter):

diff --git a/jrnl/plugins/importer/jrnl.py b/jrnl/plugins/importer/jrnl.py
@@ -6,7 +6,7 @@
 
 from jrnl.plugins.base import BaseImporter
 
-from ... import __version__
+from jrnl.__version__ import __version__
 
 
 class Importer(BaseImporter):

diff --git a/jrnl/upgrade.py b/jrnl/upgrade.py
@@ -5,7 +5,7 @@
 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