Skip to content

Commit

Permalink
Rename importable module
Browse files Browse the repository at this point in the history
  • Loading branch information
ppfeister committed Jun 24, 2024
1 parent 7f6f600 commit ca781a3
Show file tree
Hide file tree
Showing 15 changed files with 20 additions and 20 deletions.
File renamed without changes.
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ maintainers = [
"Matheus Felipe <[email protected]>",
"Sondre Karlsen Dyrnes <[email protected]>"
]
readme = "docs/pyproj/README.md"
packages = [ { include = "sherlock"} ]
readme = "docs/pyproject/README.md"
packages = [ { include = "sherlock_project"} ]
keywords = [ "osint", "reconnaissance", "information gathering" ]
classifiers = [
"Development Status :: 5 - Production/Stable",
Expand Down Expand Up @@ -56,4 +56,4 @@ openpyxl = "^3.0.10"
jsonschema = "^4.0.0"

[tool.poetry.scripts]
sherlock = 'sherlock.sherlock:main'
sherlock = 'sherlock_project.sherlock:main'
File renamed without changes.
2 changes: 1 addition & 1 deletion sherlock/__main__.py → sherlock_project/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
print(f"Sherlock requires Python 3.8+\nYou are using Python {python_version}, which is not supported by Sherlock.")
sys.exit(1)

from sherlock import sherlock
from sherlock_project import sherlock
sherlock.main()
2 changes: 1 addition & 1 deletion sherlock/notify.py → sherlock_project/notify.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
This module defines the objects for notifying the caller about the
results of queries.
"""
from sherlock.result import QueryStatus
from sherlock_project.result import QueryStatus
from colorama import Fore, Style
import webbrowser

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
12 changes: 6 additions & 6 deletions sherlock/sherlock.py → sherlock_project/sherlock.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@
__version__ = "0.14.4"
del __version__

from .__init__ import ( # noqa: E402
from sherlock_project.__init__ import ( # noqa: E402
__longname__,
__version__
)

from requests_futures.sessions import FuturesSession # noqa: E402
from torrequest import TorRequest # noqa: E402
from sherlock.result import QueryStatus # noqa: E402
from sherlock.result import QueryResult # noqa: E402
from sherlock.notify import QueryNotify # noqa: E402
from sherlock.notify import QueryNotifyPrint # noqa: E402
from sherlock.sites import SitesInformation # noqa: E402
from sherlock_project.result import QueryStatus # noqa: E402
from sherlock_project.result import QueryResult # noqa: E402
from sherlock_project.notify import QueryNotify # noqa: E402
from sherlock_project.notify import QueryNotifyPrint # noqa: E402
from sherlock_project.sites import SitesInformation # noqa: E402
from colorama import init # noqa: E402
from argparse import ArgumentTypeError # noqa: E402

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import json
import urllib
import pytest
from sherlock.sites import SitesInformation
from sherlock_project.sites import SitesInformation

@pytest.fixture()
def sites_obj():
Expand Down
4 changes: 2 additions & 2 deletions tests/few_test_basic.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import sherlock
import sherlock_project

#from sherlock.sites import SitesInformation
#local_manifest = data_file_path=os.path.join(os.path.dirname(__file__), "../sherlock/resources/data.json")

def test_username_via_message():
sherlock.__main__("--version")
sherlock_project.__main__("--version")
6 changes: 3 additions & 3 deletions tests/test_probes.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
import random
import string
import re
from sherlock.sherlock import sherlock
from sherlock.notify import QueryNotify
from sherlock.result import QueryStatus
from sherlock_project.sherlock import sherlock
from sherlock_project.notify import QueryNotify
from sherlock_project.result import QueryStatus
#from sherlock_interactives import Interactives


Expand Down
2 changes: 1 addition & 1 deletion tests/test_ux.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import pytest
from sherlock import sherlock
from sherlock_project import sherlock
from sherlock_interactives import Interactives
from sherlock_interactives import InteractivesSubprocessError

Expand Down
4 changes: 2 additions & 2 deletions tests/test_version.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import os
from sherlock_interactives import Interactives
import sherlock
import sherlock_project

def test_versioning() -> None:
# Ensure __version__ matches version presented to the user
assert sherlock.__version__ in Interactives.run_cli("--version")
assert sherlock_project.__version__ in Interactives.run_cli("--version")
# Ensure __init__ is single source of truth for __version__ in package
# Temporarily allows sherlock.py so as to not trigger early upgrades
found:list = Interactives.walk_sherlock_for_files_with(r'__version__ *= *')
Expand Down

0 comments on commit ca781a3

Please sign in to comment.