Release 0.7.2

Author: danielfrg

Makefile

@@ -10,9 +10,8 @@ TEST_MARKERS ?= "not selenium"
 
 SELENIUM_HUB_HOST ?= 127.0.0.1
 SELENIUM_HUB_PORT ?= 4444
-# Running locally
 PYTEST_BASE_URL ?= http://localhost:8866
-# Running selenium inside docker
+# For selenium running in Docker to access the host
 # PYTEST_BASE_URL ?= http://host.docker.internal:8866
 
 
@@ -46,6 +45,7 @@ upload-test:  ## Upload package to test PyPI
 
 
 cleanpython:  ## Clean Python build files
+	rm -rf .pytest_cache
 	cd $(CURDIR)/python; rm -rf build dist htmlcov .pytest_cache test-results .eggs
 	cd $(CURDIR)/python; rm -f .coverage coverage.xml jupyter_flex/_generated_version.py
 	find . -type f -name '*.py[co]' -delete
@@ -54,10 +54,10 @@ cleanpython:  ## Clean Python build files
 	rm -rf site docs/examples
 	rm -f examples/*.html examples/**/*.html
 
+
 # ------------------------------------------------------------------------------
 # Javascript
 
-
 npm-i: npm-install
 npm-install:  ## Install JS dependencies
 	cd $(CURDIR)/js/; npm install
@@ -203,9 +203,8 @@ examples-clear-output:  ## Clear output of notebooks
 # ------------------------------------------------------------------------------
 # Other
 
-
 cleanall: cleanpython cleanjs  ## Clean everything
-	rm -rf *.egg-info
+	cd $(CURDIR)/python; rm -rf *.egg-info
 	cd $(CURDIR)/js/; rm -rf node_modules
 
 

RELEASE.md

@@ -2,7 +2,7 @@
 
 ## Upload to test PyPI
 
-```
+```shell
 export VERSION=1.0.0
 git checkout -b release-${VERSION}
 
@@ -14,7 +14,7 @@ make cleanall
 make npm-install
 
 # Build
-make build
+make all
 
 # Upload to test pypi
 make upload-test
@@ -37,27 +37,26 @@ Merge branch when CI passes
 - Update `README.md` and docs:
     - Links to Binder should use the new version
 
-```
+```shell
 export VERSION=1.0.0
 
 # Optional reset
 make cleanall
-make download-assets
 make npm-install
 
 git commit -am "Release ${VERSION}" --allow-empty
 git tag ${VERSION}
 
 # Build
-make build
+make all
 make upload-pypi
 git push origin ${VERSION}
 git push
 ```
 
 ### NPM release
 
-```
+```shell
 export VERSION=1.0.0
 
 cd js

python/jupyter_flex/__init__.py

@@ -22,4 +22,5 @@ def parse_git(root, **kwargs):
         __version__ = None
 
 from .exporter import FlexExporter  # noqa
+
 # from .exporter_illusionist import FlexIllusionistExporter  # noqa

python/jupyter_flex/exporter_illusionist.py

@@ -4,7 +4,6 @@
 from nbconvert.exporters.html import HTMLExporter
 from traitlets import default
 
-
 try:
     from illusionist.preprocessor import IllusionistPreprocessor
 except ImportError:

python/jupyter_flex/tests/conftest.py

@@ -73,13 +73,14 @@ def image_diff_reference_dir():
 @pytest.fixture(scope="function")
 def _image_diff_info(request, image_diff_reference_dir, image_diff_dir):
     import os
+
     from pytest_image_diff.helpers import get_test_info
     from pytest_image_diff.plugin import DiffInfo
 
     def _factory(image, suffix=None):
         test_info = get_test_info(request)
         class_name = test_info.class_name
-        test_name = test_info.test_name
+        # test_name = test_info.test_name
         if suffix is None:
             # Todo enumerate every call
             suffix = ""
@@ -91,7 +92,9 @@ def _factory(image, suffix=None):
         image_name = os.path.join(screenshot_dir, suffix + "-screenshot.png")
         diff_name = os.path.join(screenshot_dir, suffix + "-diff.png")
         return DiffInfo(
-            diff_name=diff_name, image_name=image_name, reference_name=reference_name
+            diff_name=diff_name,
+            image_name=image_name,
+            reference_name=reference_name,
         )
 
     return _factory

python/jupyter_flex/tests/test_examples.py

@@ -3,7 +3,6 @@
 
 import pytest
 
-
 pytestmark = [pytest.mark.nondestructive, pytest.mark.examples]
 base_url = os.environ.get("PYTEST_BASE_URL", "http://localhost:8866")
 

python/jupyter_flex/tests/test_illusionist.py

@@ -3,8 +3,11 @@
 
 import pytest
 
-
-pytestmark = [pytest.mark.nondestructive, pytest.mark.illusionist, pytest.mark.skip]
+pytestmark = [
+    pytest.mark.nondestructive,
+    pytest.mark.illusionist,
+    pytest.mark.skip,
+]
 base_url = os.environ.get("PYTEST_BASE_URL", "http://localhost:8866")
 
 

python/jupyter_flex/tests/test_import.py

@@ -1,6 +1,5 @@
 import pytest
 
-
 pytestmark = [pytest.mark.nondestructive, pytest.mark.base]
 
 

python/jupyter_flex/tests/test_layouts.py

@@ -3,8 +3,11 @@
 
 import pytest
 
-
-pytestmark = [pytest.mark.nondestructive, pytest.mark.layouts, pytest.mark.examples]
+pytestmark = [
+    pytest.mark.nondestructive,
+    pytest.mark.layouts,
+    pytest.mark.examples,
+]
 base_url = os.environ.get("PYTEST_BASE_URL", "http://localhost:8866")
 
 

python/jupyter_flex/tests/test_splinter.py

@@ -1,6 +1,5 @@
 import pytest
 
-
 pytestmark = [pytest.mark.nondestructive]
 
 

python/jupyter_flex/utils.py

@@ -1,7 +1,6 @@
 import pkg_resources
 from pip._internal.utils.misc import dist_is_editable
 
-
 distributions = {v.key: v for v in pkg_resources.working_set}
 DEV_MODE = dist_is_editable(distributions["jupyter-flex"])
 # DEV_MODE = False

python/pyproject.toml

@@ -1,18 +1,28 @@
 [tool.poetry]
 name = "jupyter-flex"
-version = "0.8.0-dev"
-description = "Dashboards for Jupyter"
-authors = ["Daniel Rodriguez <[email protected]>"]
-
-[build-system]
-requires = ["setuptools>=42", "setuptools_scm[toml]>=3.4", "wheel"]
-
-# [tool.setuptools_scm]
-# root = "../"
-# write_to = "python/jupyter_flex/_generated_version.py"
+version = "1.0.0"
+packages = [{ include = "jupyter_flex" }]
+homepage = "https://github.com/danielfrg/jupyter-flex"
+repository = "https://github.com/danielfrg/jupyter-flex"
+documentation = "https://github.com/danielfrg/jupyter-flex"
+description = "Build dashboards using Jupyter Notebooks"
+authors = ["Daniel Rodriguez"]
+maintainers = ["Daniel Rodriguez"]
+license = "Apache License, Version 2.0"
+readme = "README.md"
+classifiers = [
+  "Development Status :: 5 - Production/Stable",
+  "Operating System :: OS Independent",
+  "Intended Audience :: Science/Research",
+  "Programming Language :: Python",
+  "Programming Language :: Python :: 3",
+  "Topic :: Scientific/Engineering",
+]
 
+# I am just using Poetry dependencies for the CI system
+# When Mac supports the dependencies we can use it for dev
 [tool.poetry.dependencies]
-python = "^3.8"
+python = ">=3.7.1,<4"
 voila = ">=0.2.0,<0.3"
 nbconvert = ">=6.0.0,<7"
 ipykernel = ">=6.4.1<7"
@@ -47,8 +57,17 @@ pytest-image-diff = "^0.0.6"
 
 
 [tool.pytest.ini_options]
-norecursedirs = ".git,dist,build,env,venv,.venv"
-addopts = "jupyter_flex/tests -s -vv --cov-config=pyproject.toml --cov=jupyter_flex --cov-report term-missing"
+addopts = [
+  "-s", "-vv",
+  "--ignore=site-packages",
+  "--ignore=dist-packages",
+  "--ignore=dist",
+  "--strict-markers",
+  "--cov=jupyter_flex",
+  "--cov-report=term-missing",
+  "--cov-config=pyproject.toml",
+]
+xfail_strict = true
 markers = [
     "base: marks tests as base (deselect with '-m \"not base\"')",
     "layouts: mark all layout tests",
@@ -60,35 +79,29 @@ filterwarnings = [
     "ignore::DeprecationWarning",
 ]
 
+[tool.coverage.run]
+parallel = true
+branch = true
+
 [tool.coverage.report]
-omit = ["jupyter_flex/_generated_version.py", "jupyter_flex/tests/*"]
+omit = ["jupyter_flex/tests/*"]
 
 [tool.black]
-target-version = ["py37", "py38"]
-exclude = '''
-(
-    asv_bench/env
-  | \.egg
-  | \.git
-  | \.hg
-  | \.mypy_cache
-  | \.nox
-  | \.tox
-  | \.venv
-  | _build
-  | buck-out
-  | build
-  | dist
-  | _generated_version.py
-  | node_modules
-)
-'''
+line_length = 79
+skip_string_normalization = true
 
 [tool.isort]
-# https://black.readthedocs.io/en/stable/the_black_code_style.html#how-black-wraps-lines
+ensure_newline_before_comments = true
+line_length = 79
 multi_line_output = 3
-lines_after_imports = 2
-force_grid_wrap = 0
-include_trailing_comma = "true"
-use_parentheses = "true"
-line_length = 88
+include_trailing_comma = true
+profile = "black"
+
+[tool.pydocstyle]
+inherit = false
+convention = "numpy"
+match_dir = "jupyter_flex"
+add_ignore = ["D100", "D101", "D102", "D103", "D104", "D105"]
+
+[build-system]
+requires = ["setuptools>=42", "setuptools_scm[toml]>=3.4", "wheel"]

python/setup.cfg

@@ -4,4 +4,4 @@ max-line-length = 80
 ignore = E203, E501, W503
 select = C,E,F,W,B,B950
 paths = .,jupyter_flex
-exclude = .git,dist,build,env,venv,*.egg*,node_modules
+exclude = .git,dist,build,env,venv,.venv,*.egg*,node_modules

python/setup.py

@@ -4,7 +4,6 @@
 from setuptools import find_packages, setup
 from setuptools.command.develop import develop
 
-
 setup_dir = os.path.abspath(os.path.dirname(__file__))
 
 
@@ -22,7 +21,9 @@ def read_file(filename):
 def parse_git(root, **kwargs):
     from setuptools_scm.git import parse
 
-    kwargs["describe_command"] = 'git describe --dirty --tags --long --match "[0-9].*"'
+    kwargs[
+        "describe_command"
+    ] = 'git describe --dirty --tags --long --match "[0-9].*"'
     return parse(root, **kwargs)
 
 
@@ -32,7 +33,13 @@ def get_data_files():
     for (dirpath, dirnames, filenames) in os.walk("share/jupyter/"):
         if filenames:
             data_files.append(
-                (dirpath, [os.path.join(dirpath, filename) for filename in filenames])
+                (
+                    dirpath,
+                    [
+                        os.path.join(dirpath, filename)
+                        for filename in filenames
+                    ],
+                )
             )
     return data_files
 
@@ -78,7 +85,6 @@ def run(self):
         ),
     },
     packages=find_packages(),
-    # package_dir={"": "src"},
     zip_safe=False,
     include_package_data=True,
     package_data={"jupyter_flex": ["static/*"]},
@@ -113,9 +119,11 @@ def run(self):
         "dashboards",
     ],
     classifiers=[
-        "License :: OSI Approved :: Apache Software License",
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
+        "Development Status :: 5 - Production/Stable",
+        "Operating System :: OS Independent",
+        "Intended Audience :: Science/Research",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3",
+        "Topic :: Scientific/Engineering",
     ],
 )