Skip to content

Commit

Permalink
fix: formatting imports (#63)
Browse files Browse the repository at this point in the history
  • Loading branch information
PatrickAlphaC authored Sep 21, 2024
1 parent 3275d51 commit 23a1cb6
Show file tree
Hide file tree
Showing 44 changed files with 201 additions and 151 deletions.
3 changes: 2 additions & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@
# -- Project information -----------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information

import moccasin
import os
import sys

import moccasin

sys.path.insert(0, os.path.abspath("."))

project = "moccasin"
Expand Down
3 changes: 2 additions & 1 deletion docs/source/moccasin_wrapper_for_docs.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import argparse
from typing import Tuple

from moccasin.__main__ import generate_main_parser_and_sub_parsers
import argparse


# Wrapper function for sphinx-argparse
Expand Down
2 changes: 2 additions & 0 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@ typecheck:

# Run formatter
format:
uv run ruff check --select I --fix
uv run ruff check . --fix

# Run formatter - no fix
format-check:
uv run ruff check --select I
uv run ruff check .

# Run unit and CLI tests, fail on first test failure
Expand Down
1 change: 1 addition & 0 deletions moccasin/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import sys

from moccasin import __main__


Expand Down
10 changes: 5 additions & 5 deletions moccasin/__main__.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import argparse
import importlib
import sys
import tomllib
from importlib import metadata
from pathlib import Path
import tomllib
import argparse
from typing import Tuple
from moccasin.logging import logger, set_log_level
import sys
from moccasin.constants.vars import CONFIG_NAME

from moccasin.constants.vars import CONFIG_NAME
from moccasin.logging import logger, set_log_level

MOCCASIN_CLI_VERSION_STRING = "Moccasin CLI v{}"

Expand Down
12 changes: 7 additions & 5 deletions moccasin/_sys_path_and_config_setup.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
from pathlib import Path
import contextlib
import sys
from moccasin.config import get_config
from moccasin.moccasin_account import MoccasinAccount
from pathlib import Path
from typing import Iterator, List

import boa

from moccasin.config import get_config
from moccasin.logging import logger
import contextlib
from typing import Iterator, List
from moccasin.moccasin_account import MoccasinAccount


@contextlib.contextmanager
Expand Down
5 changes: 4 additions & 1 deletion moccasin/boa_tools.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# A convenience module for getting boa stuff easily
from boa.contracts.vyper.vyper_contract import VyperContract, VyperDeployer # noqa: F401
from boa.contracts.vyper.vyper_contract import ( # noqa: F401
VyperContract,
VyperDeployer,
)
from boa_zksync.contract import ZksyncContract # noqa: F401
from boa_zksync.deployer import ZksyncDeployer # noqa: F401
26 changes: 13 additions & 13 deletions moccasin/commands/compile.py
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
from pathlib import Path
from vyper.compiler.phases import CompilerData
import vyper.compiler.output
import json
from moccasin.logging import logger
from moccasin.constants.vars import BUILD_FOLDER, CONTRACTS_FOLDER, MOCCASIN_GITHUB
from moccasin.config import get_config, initialize_global_config
from vyper.exceptions import VersionException
import traceback
import sys

import os
import multiprocessing
import os
import sys
import time
import traceback
from argparse import Namespace
from pathlib import Path

import vyper.compiler.output
from boa import load_partial
from boa.contracts.vyper.vyper_contract import VyperDeployer
from boa.contracts.vvm.vvm_contract import VVMDeployer
from argparse import Namespace
from boa.contracts.vyper.vyper_contract import VyperDeployer
from vyper.compiler.phases import CompilerData
from vyper.exceptions import VersionException

from moccasin.config import get_config, initialize_global_config
from moccasin.constants.vars import BUILD_FOLDER, CONTRACTS_FOLDER, MOCCASIN_GITHUB
from moccasin.logging import logger


def main(args: Namespace) -> int:
Expand Down
3 changes: 2 additions & 1 deletion moccasin/commands/config_.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from argparse import Namespace
from moccasin.config import get_config, Config

from moccasin.config import Config, get_config
from moccasin.logging import logger


Expand Down
13 changes: 7 additions & 6 deletions moccasin/commands/console.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
from argparse import Namespace
from pathlib import Path
from moccasin.logging import logger
import atexit
import code
import readline
from moccasin.config import get_config, initialize_global_config
from argparse import Namespace
from pathlib import Path

from moccasin._sys_path_and_config_setup import (
_patch_sys_path,
_setup_network_and_account_from_args,
)
from moccasin.constants.vars import DEFAULT_MOCCASIN_FOLDER, CONSOLE_HISTORY_FILE
import atexit
from moccasin.config import get_config, initialize_global_config
from moccasin.constants.vars import CONSOLE_HISTORY_FILE, DEFAULT_MOCCASIN_FOLDER
from moccasin.logging import logger


def main(args: Namespace) -> int:
Expand Down
7 changes: 4 additions & 3 deletions moccasin/commands/deploy.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
from moccasin.logging import logger
from moccasin.config import get_config, initialize_global_config
from argparse import Namespace

from moccasin._sys_path_and_config_setup import (
_patch_sys_path,
_setup_network_and_account_from_args,
)
from argparse import Namespace
from moccasin.config import get_config, initialize_global_config
from moccasin.logging import logger


def main(args: Namespace) -> int:
Expand Down
10 changes: 6 additions & 4 deletions moccasin/commands/explorer.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
import json
import os
from argparse import Namespace
from pathlib import Path
from typing import cast

import boa
from argparse import Namespace
import os

from moccasin.config import Network, get_config
from moccasin.constants.vars import (
DEFAULT_API_KEY_ENV_VAR,
DEFAULT_NETWORKS_BY_NAME,
DEFAULT_NETWORKS_BY_CHAIN_ID,
DEFAULT_NETWORKS_BY_NAME,
)
from moccasin.logging import logger, set_log_level
from moccasin.config import get_config, Network

ALIAS_TO_COMMAND = {"get": "fetch"}

Expand Down
33 changes: 17 additions & 16 deletions moccasin/commands/init.py
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
from argparse import Namespace
from pathlib import Path
from moccasin.logging import logger
from moccasin.constants.vars import (
CONFIG_NAME,
DEFAULT_PROJECT_FOLDERS,
README_PATH,
COUNTER_CONTRACT,
CONTRACTS_FOLDER,
SCRIPT_FOLDER,
TESTS_FOLDER,
)

from moccasin.constants.file_data import (
GITIGNORE,
GITATTRIBUTES,
README_MD_SRC,
COUNTER_VYPER_CONTRACT_SRC,
CONFTEST_DEFAULT,
COUNTER_VYPER_CONTRACT_SRC,
COVERAGERC,
DEPLOY_SCRIPT_DEFAULT,
TEST_COUNTER_DEFAULT,
GITATTRIBUTES,
GITIGNORE,
MOCCASIN_DEFAULT_CONFIG,
README_MD_SRC,
TEST_COUNTER_DEFAULT,
VSCODE_SETTINGS_DEFAULT,
)
from argparse import Namespace
from moccasin.constants.vars import (
CONFIG_NAME,
CONTRACTS_FOLDER,
COUNTER_CONTRACT,
DEFAULT_PROJECT_FOLDERS,
README_PATH,
SCRIPT_FOLDER,
TESTS_FOLDER,
)
from moccasin.logging import logger


def main(args: Namespace) -> int:
Expand Down
4 changes: 2 additions & 2 deletions moccasin/commands/inspect.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import pprint
from argparse import Namespace
from typing import Any

from moccasin.config import get_config
from moccasin.commands.compile import compile_
import pprint
from moccasin.config import get_config

FUNCTION_SIGNATURES_ALTS = [
"methods",
Expand Down
32 changes: 17 additions & 15 deletions moccasin/commands/install.py
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
from argparse import Namespace
from dataclasses import dataclass
from io import BytesIO
from pathlib import Path
import shutil
import subprocess
from packaging.requirements import Requirement
from moccasin.config import get_config
from moccasin.logging import logger
import os
from base64 import b64encode
import re
import requests # type: ignore
import shutil
import subprocess
import sys
import tomllib
import traceback
from tqdm import tqdm
import zipfile
from moccasin.constants.vars import REQUEST_HEADERS, PACKAGE_VERSION_FILE
import tomllib
import tomli_w
from argparse import Namespace
from base64 import b64encode
from dataclasses import dataclass
from enum import Enum
from io import BytesIO
from pathlib import Path
from urllib.parse import quote

import requests # type: ignore
import tomli_w
from packaging.requirements import Requirement
from tqdm import tqdm

from moccasin.config import get_config
from moccasin.constants.vars import PACKAGE_VERSION_FILE, REQUEST_HEADERS
from moccasin.logging import logger


class DependencyType(Enum):
GITHUB = "github"
Expand Down
6 changes: 4 additions & 2 deletions moccasin/commands/purge.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
from argparse import Namespace
import subprocess
from argparse import Namespace

from packaging.requirements import Requirement

from moccasin._dependency_helpers import get_base_install_path
from moccasin.config import get_config
from packaging.requirements import Requirement
from moccasin.logging import logger


Expand Down
9 changes: 5 additions & 4 deletions moccasin/commands/run.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
from pathlib import Path
from moccasin.logging import logger
from moccasin.config import get_config, initialize_global_config
import importlib.util
from argparse import Namespace
from pathlib import Path

from moccasin._sys_path_and_config_setup import (
_patch_sys_path,
_setup_network_and_account_from_args,
)
from argparse import Namespace
from moccasin.config import get_config, initialize_global_config
from moccasin.logging import logger


def main(args: Namespace) -> int:
Expand Down
11 changes: 6 additions & 5 deletions moccasin/commands/test.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import sys
from argparse import Namespace
from typing import List
from moccasin.config import initialize_global_config, get_config

import pytest

from moccasin._sys_path_and_config_setup import (
_patch_sys_path,
_setup_network_and_account_from_args,
)
import pytest
import sys
from argparse import Namespace

from moccasin.config import get_config, initialize_global_config
from moccasin.constants.vars import TESTS_FOLDER

PYTEST_ARGS: list[str] = [
Expand Down
17 changes: 9 additions & 8 deletions moccasin/commands/wallet.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
import json
import getpass
from pathlib import Path
import json
import shutil
from typing import Any
from moccasin.logging import logger
from moccasin.constants.vars import DEFAULT_KEYSTORES_PATH
from argparse import Namespace
from pathlib import Path
from typing import Any, cast

from eth_account import Account as EthAccountsClass
from eth_account.signers.local import LocalAccount
from hexbytes import HexBytes
from eth_account.types import PrivateKeyType
from argparse import Namespace
from typing import cast
from hexbytes import HexBytes

from moccasin.constants.vars import DEFAULT_KEYSTORES_PATH
from moccasin.logging import logger

ALIAS_TO_COMMAND = {"add": "import", "i": "import"}

Expand Down
Loading

0 comments on commit 23a1cb6

Please sign in to comment.