mirror of
https://github.com/sherlock-project/sherlock
synced 2024-11-24 21:03:04 +00:00
Rename importable module
This commit is contained in:
parent
7f6f600fed
commit
ca781a3c3b
15 changed files with 20 additions and 20 deletions
|
@ -20,8 +20,8 @@ maintainers = [
|
|||
"Matheus Felipe <matheusfelipeog@protonmail.com>",
|
||||
"Sondre Karlsen Dyrnes <sondre@villdyr.no>"
|
||||
]
|
||||
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",
|
||||
|
@ -56,4 +56,4 @@ openpyxl = "^3.0.10"
|
|||
jsonschema = "^4.0.0"
|
||||
|
||||
[tool.poetry.scripts]
|
||||
sherlock = 'sherlock.sherlock:main'
|
||||
sherlock = 'sherlock_project.sherlock:main'
|
||||
|
|
|
@ -18,5 +18,5 @@ if __name__ == "__main__":
|
|||
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()
|
|
@ -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
|
||||
|
|
@ -24,18 +24,18 @@ import requests
|
|||
__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
|
||||
|
|
@ -2,7 +2,7 @@ import os
|
|||
import json
|
||||
import urllib
|
||||
import pytest
|
||||
from sherlock.sites import SitesInformation
|
||||
from sherlock_project.sites import SitesInformation
|
||||
|
||||
@pytest.fixture()
|
||||
def sites_obj():
|
||||
|
|
|
@ -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")
|
||||
|
|
|
@ -2,9 +2,9 @@ import pytest
|
|||
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
|
||||
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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__ *= *')
|
||||
|
|
Loading…
Reference in a new issue