diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 80aae47..0ff5141 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -49,7 +49,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest] # eventually add `windows-latest` - python-version: [3.7, 3.8, 3.9] + python-version: [3.8, 3.9, '3.10'] steps: - uses: actions/checkout@v2 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ac9e94f..a267258 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,36 +1,30 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.0.1 + rev: v4.2.0 hooks: - id: check-yaml -- repo: https://github.com/asottile/seed-isort-config - rev: v2.2.0 - hooks: - - id: seed-isort-config - - repo: https://github.com/pre-commit/mirrors-isort - rev: v5.9.3 + rev: v5.10.1 hooks: - id: isort - repo: https://github.com/psf/black - rev: 21.10b0 + rev: 22.6.0 hooks: - id: black name: black - repo: https://gitlab.com/pycqa/flake8 - rev: 3.9.2 + rev: 4.0.1 hooks: - id: flake8 - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.910-1 + rev: v0.971 hooks: - id: mypy - additional_dependencies: [types-PyYAML, types-requests] - + additional_dependencies: [types-requests] default_language_version: - python: python3.8 + python: python3 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dfe6d31..de56ec7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,11 +11,11 @@ cd ape-notebook python3 -m venv venv source venv/bin/activate -# install brownie into the virtual environment +# install ape-notebook into the virtual environment python setup.py install # install the developer dependencies (-e is interactive mode) -pip install -e .[dev] +pip install -e .'[dev]' ``` ## Pre-Commit Hooks diff --git a/ape_notebook/_cli.py b/ape_notebook/_cli.py index 59c4665..97d822f 100644 --- a/ape_notebook/_cli.py +++ b/ape_notebook/_cli.py @@ -1,4 +1,5 @@ import click + from notebook import notebookapp as app diff --git a/pyproject.toml b/pyproject.toml index 84aa93e..3ab0a0b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,7 @@ write_to = "ape_notebook/version.py" [tool.black] line-length = 100 -target-version = ['py37', 'py38', 'py39'] +target-version = ['py37', 'py38', 'py39', 'py310'] include = '\.pyi?$' [tool.pytest.ini_options] diff --git a/setup.py b/setup.py index 7db4151..4d6b385 100644 --- a/setup.py +++ b/setup.py @@ -4,16 +4,16 @@ extras_require = { "test": [ # `test` GitHub Action jobs uses this - "pytest>=6.0,<7.0", # Core testing package + "pytest>=6.0", # Core testing package "pytest-xdist", # multi-process runner "pytest-cov", # Coverage analyzer plugin "hypothesis>=6.2.0,<7.0", # Strategy-based fuzzer ], "lint": [ - "black>=21.10b0,<22.0", # auto-formatter and linter - "mypy>=0.910,<1.0", # Static type analyzer - "flake8>=3.8.3,<4.0", # Style linter - "isort>=5.9.3,<6.0", # Import sorting linter + "black>=22.6.0", # auto-formatter and linter + "mypy>=0.971", # Static type analyzer + "flake8>=4.0.1", # Style linter + "isort>=5.10.1", # Import sorting linter ], "release": [ # `release` GitHub Action job uses this "setuptools", # Installation tool @@ -50,16 +50,20 @@ long_description_content_type="text/markdown", author="ApeWorX Ltd.", author_email="admin@apeworx.io", - url="https://github.com/ApeWorX/", + url="https://github.com/ApeWorX/ape-notebook", include_package_data=True, install_requires=[ "importlib-metadata ; python_version<'3.8'", "notebook>=6.4.11", "click>=8.1.0", - "eth-ape>=0.2.2,<0.3.0" - ], # NOTE: Add 3rd party libraries here - entry_points={"ape_cli_subcommands": ["ape_notebook=ape_notebook._cli:cli"]}, - python_requires=">=3.7,<4", + "eth-ape>=0.5.0,<0.6.0", + ], + entry_points={ + "ape_cli_subcommands": [ + "ape_notebook=ape_notebook._cli:cli", + ], + }, + python_requires=">=3.8,<4", extras_require=extras_require, py_modules=["ape_notebook"], license="Apache-2.0", @@ -68,15 +72,15 @@ packages=find_packages(exclude=["tests", "tests.*"]), package_data={"ape_notebook": ["py.typed"]}, classifiers=[ - "Development Status :: 4 - Beta", + "Development Status :: 5 - Production/Stable", "Intended Audience :: Developers", "License :: OSI Approved :: Apache Software License", "Natural Language :: English", "Operating System :: MacOS", "Operating System :: POSIX", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", ], )