Merge branch 'master' into 72-native-cron-scheduler-doesnt-match-convention

Author: ceallen

setup.cfg

@@ -1,3 +1,62 @@
+[metadata]
+name = notebooker
+author = Man Quant Technology
+author_email = ManAlphaTech@man.com
+description = Tool for parametrizing, executing, and displaying Jupyter Notebooks as reports.
+long_description_content_type = text/markdown
+license = AGPLv3
+url = https://github.com/man-group/notebooker
+classifiers =
+    Development Status :: 5 - Production/Stable
+    License :: OSI Approved :: GNU Affero General Public License v3
+    Framework :: Flask
+    Framework :: IPython
+    Framework :: Jupyter
+    Programming Language :: Python :: 3.6
+    Operating System :: POSIX
+    Operating System :: MacOS :: MacOS X
+    Operating System :: Microsoft :: Windows :: Windows 10
+    Topic :: Internet :: WWW/HTTP
+    Topic :: Internet :: WWW/HTTP :: WSGI :: Application
+    Topic :: Software Development :: Libraries
+
+[options]
+setup_requires =
+    six
+    numpy
+install_requires =
+    requests
+    importlib-metadata; python_version < "3.8"
+    apscheduler
+    babel
+    cachelib
+    click>7.1.0
+    dataclasses; python_version < "3.8"
+    flask
+    gevent
+    gitpython
+    inflection
+    ipykernel
+    ipython
+    ipython_genutils
+    jupytext>=1.2.0
+    matplotlib
+    nbconvert
+    nbformat
+    pandas
+    papermill
+    pymongo
+    python-dateutil
+    requests
+    retrying
+    stashy
+    Werkzeug<2.2
+
+[options.extras_require]
+prometheus = prometheus_client
+docs = docutils<0.18; sphinx<3.0.0; numpydoc; sphinxcontrib-httpdomain; sphinxcontrib-httpdomain; sphinx-click
+test = openpyxl; pytest; mock; pytest-cov; pytest-timeout; pytest-xdist; pytest-server-fixtures; freezegun; hypothesis>=3.83.2
+
 [flake8]
 ignore = F401,E203,W504,W503
 max-line-length = 160

setup.py

@@ -21,73 +21,13 @@ def get_long_description():
     return desc
 
 
-# Note: pytest >= 4.1.0 is not compatible with pytest-cov < 2.6.1.
-test_requirements = [
-    "openpyxl",
-    "pytest",
-    "mock",
-    "pytest-cov",
-    "pytest-timeout",
-    "pytest-xdist",
-    "pytest-server-fixtures",
-    "freezegun",
-    "hypothesis>=3.83.2",
-]
-
 setup(
-    name="notebooker",
     version=get_version(),
-    author="Man Quant Technology",
-    author_email="ManAlphaTech@man.com",
-    description="Tool for parametrizing, executing, and displaying Jupyter Notebooks as reports.",
-    long_description=get_long_description(),
-    long_description_content_type="text/markdown",
-    license="AGPLv3",
-    url="https://github.com/man-group/notebooker",
     packages=find_packages(exclude=["tests", "tests.*", "benchmarks"]),
     namespace_packages=["notebooker"],
-    setup_requires=["six", "numpy"],
     python_requires=">=3.5",
     zip_safe=False,
     include_package_data=True,
-    install_requires=[
-        "apscheduler",
-        "babel",
-        "cachelib",
-        "click>7.1.0",
-        'dataclasses; python_version < "3.8"',
-        "flask",
-        "gevent",
-        "gitpython",
-        "inflection",
-        "ipykernel",
-        "ipython",
-        "ipython_genutils",
-        "jupytext>=1.2.0",
-        "matplotlib",
-        "nbconvert",
-        "nbformat",
-        "pandas",
-        "papermill",
-        "pymongo",
-        "python-dateutil",
-        "requests",
-        "retrying",
-        "stashy",
-        "Werkzeug<2.2",
-    ],
-    extras_require={
-        "prometheus": ["prometheus_client"],
-        "test": test_requirements,
-        "docs": [
-            "docutils<0.18",
-            "sphinx<3.0.0",
-            "numpydoc",
-            "sphinxcontrib-httpdomain",
-            "sphinx-click"
-        ],  # Sphinx v3 doesn't play nicely with Flask, yet.
-    },
-    tests_require=test_requirements,
     entry_points={
         "console_scripts": [
             "notebooker-cli = notebooker._entrypoints:base_notebooker",
@@ -97,18 +37,4 @@ def get_long_description():
             "convert_ipynb_to_py = notebooker.convert_to_py:main",
         ]
     },
-    classifiers=[
-        "Development Status :: 5 - Production/Stable",
-        "License :: OSI Approved :: GNU Affero General Public License v3",
-        "Framework :: Flask",
-        "Framework :: IPython",
-        "Framework :: Jupyter",
-        "Programming Language :: Python :: 3.6",
-        "Operating System :: POSIX",
-        "Operating System :: MacOS :: MacOS X",
-        "Operating System :: Microsoft :: Windows :: Windows 10",
-        "Topic :: Internet :: WWW/HTTP",
-        "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
-        "Topic :: Software Development :: Libraries",
-    ],
 )