Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove __init__.py files #1275

Merged
merged 1 commit into from
Jun 26, 2021
Merged

Remove __init__.py files #1275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion features/steps/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from yaml.loader import FullLoader

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
Expand Down
7 changes: 2 additions & 5 deletions jrnl/DayOneJournal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@

from . import Entry
from . import Journal
from . import __title__
from . import __version__
from jrnl.__version__ import __version__


class DayOne(Journal.Journal):
Expand Down Expand Up @@ -135,9 +134,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"])
Expand Down
9 changes: 0 additions & 9 deletions jrnl/__init__.py
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions jrnl/__main__.py
View file
Open in desktop

This file was deleted.

7 changes: 3 additions & 4 deletions jrnl/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@


def preconfig_diagnostic(_):
from jrnl import __version__
from jrnl.__version__ import __version__

print(
f"jrnl: {__version__}\n"
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion jrnl/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions jrnl/plugins/__init__.py
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion jrnl/plugins/exporter/dates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

from jrnl.plugins.base import BaseExporter

from ... import __version__
from jrnl.__version__ import __version__


class Exporter(BaseExporter):
Expand Down
2 changes: 1 addition & 1 deletion jrnl/plugins/exporter/fancy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,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):
Expand Down
2 changes: 1 addition & 1 deletion jrnl/plugins/exporter/json.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,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):
Expand Down
2 changes: 1 addition & 1 deletion jrnl/plugins/exporter/markdown.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion jrnl/plugins/exporter/pretty.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from jrnl.plugins.base import BaseExporter

from ... import __version__
from jrnl.__version__ import __version__


class Exporter(BaseExporter):
Expand Down
2 changes: 1 addition & 1 deletion jrnl/plugins/exporter/short.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from jrnl.plugins.base import BaseExporter

from ... import __version__
from jrnl.__version__ import __version__


class Exporter(BaseExporter):
Expand Down
2 changes: 1 addition & 1 deletion jrnl/plugins/exporter/tag.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion jrnl/plugins/exporter/text.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from jrnl.plugins.base import BaseExporter

from ... import __version__
from jrnl.__version__ import __version__


class Exporter(BaseExporter):
Expand Down
2 changes: 1 addition & 1 deletion jrnl/plugins/exporter/xml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,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):
Expand Down
2 changes: 1 addition & 1 deletion jrnl/plugins/exporter/yaml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from jrnl.color import WARNING_COLOR
from jrnl.plugins.base import BaseExporter

from ... import __version__
from jrnl.__version__ import __version__


class Exporter(BaseExporter):
Expand Down
2 changes: 1 addition & 1 deletion jrnl/plugins/importer/jrnl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

from jrnl.plugins.base import BaseImporter

from ... import __version__
from jrnl.__version__ import __version__


class Importer(BaseImporter):
Expand Down
2 changes: 1 addition & 1 deletion jrnl/upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down