Merge pull request #691 from facultyai/v1

v1

Author: tcbegley

.github/workflows/tests.yml

@@ -51,7 +51,7 @@ jobs:
     strategy:
       max-parallel: 6
       matrix:
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9]
+        python-version: [3.6, 3.7, 3.8, 3.9]
     services:
       hub:
         image: selenium/hub:3.141.59-gold

.gitignore

@@ -30,9 +30,10 @@ docs/examples/vendor
 # R build artifacts
 inst
 man
-R
+R/*
 DESCRIPTION
 NAMESPACE
+!R/icons.R
 !R/themes.R
 
 # Julia build artifacts

R/icons.R

@@ -0,0 +1,5 @@
+#' @export'
+dbcIcons <- list(
+  BOOTSTRAP = "https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.css",
+  FONT_AWESOME = "https://use.fontawesome.com/releases/v5.15.4/css/all.css"
+)

R/themes.R

@@ -1,12 +1,12 @@
 .prependBootswatch <- function(suffix) {
-  BOOTSWATCH_BASE <- "https://stackpath.bootstrapcdn.com/bootswatch/4.5.2/"
+  BOOTSWATCH_BASE <- "https://cdn.jsdelivr.net/npm/[email protected]/dist/"
   return(paste(BOOTSWATCH_BASE, suffix, sep=""))
 }
 
 #' @export'
 dbcThemes <- list(
-  BOOTSTRAP = "https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css",
-  GRID = "https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap-grid.min.css",
+  BOOTSTRAP = "https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css",
+  GRID = "https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap-grid.min.css",
   CERULEAN = .prependBootswatch("cerulean/bootstrap.min.css"),
   COSMO = .prependBootswatch("cosmo/bootstrap.min.css"),
   CYBORG = .prependBootswatch("cyborg/bootstrap.min.css"),
@@ -18,7 +18,9 @@ dbcThemes <- list(
   LUX = .prependBootswatch("lux/bootstrap.min.css"),
   MATERIA = .prependBootswatch("materia/bootstrap.min.css"),
   MINTY = .prependBootswatch("minty/bootstrap.min.css"),
+  MORPH = .prependBootswatch("morph/bootstrap.min.css"),
   PULSE = .prependBootswatch("pulse/bootstrap.min.css"),
+  QUARTZ = .prependBootswatch("quartz/bootstrap.min.css"),
   SANDSTONE = .prependBootswatch("sandstone/bootstrap.min.css"),
   SIMPLEX = .prependBootswatch("simplex/bootstrap.min.css"),
   SKETCHY = .prependBootswatch("sketchy/bootstrap.min.css"),
@@ -27,5 +29,7 @@ dbcThemes <- list(
   SPACELAB = .prependBootswatch("spacelab/bootstrap.min.css"),
   SUPERHERO = .prependBootswatch("superhero/bootstrap.min.css"),
   UNITED = .prependBootswatch("united/bootstrap.min.css"),
-  YETI = .prependBootswatch("yeti/bootstrap.min.css")
+  VAPOR = .prependBootswatch("vapor/bootstrap.min.css"),
+  YETI = .prependBootswatch("yeti/bootstrap.min.css"),
+  ZEPHYR = .prependBootswatch("zephyr/bootstrap.min.css")
 )

dash_bootstrap_components/__init__.py

@@ -2,6 +2,7 @@
 import os
 import sys
 
+from dash_bootstrap_components import icons  # noqa
 from dash_bootstrap_components import themes  # noqa
 from dash_bootstrap_components import _components
 from dash_bootstrap_components._components import *  # noqa
@@ -37,47 +38,3 @@
 sys.modules[__name__].Table.from_dataframe = classmethod(
     _generate_table_from_df
 )
-
-
-# DatePicker deprecation warnings
-class DatePickerSingle(object):
-    def __init__(self, *args, **kwargs):
-        raise AttributeError(
-            "DatePickerSingle has been removed from dash-bootstrap-components."
-            " Use DatePickerSingle from dash-core-components instead."
-        )
-
-
-class DatePickerRange(object):
-    def __init__(self, *args, **kwargs):
-        raise AttributeError(
-            "DatePickerRange has been removed from dash-bootstrap-components. "
-            "Use DatePickerRange from dash-core-components instead."
-        )
-
-
-class CardTitle(object):
-    def __init__(self, *args, **kwargs):
-        raise AttributeError(
-            "CardTitle has been removed from dash-bootstrap-components. Set "
-            "className='card-title' on a html.H* component instead. CardTitle "
-            "originally used H5."
-        )
-
-
-class CardSubtitle(object):
-    def __init__(self, *args, **kwargs):
-        raise AttributeError(
-            "CardSubtitle has been removed from dash-bootstrap-components. "
-            "Set className='card-subtitle' on a html.H* component instead. "
-            "CardSubtitle originally used H6."
-        )
-
-
-class CardText(object):
-    def __init__(self, *args, **kwargs):
-        raise AttributeError(
-            "CardText has been removed from dash-bootstrap-components. Set "
-            "className='card-text' on a html component such as Div, or P "
-            "instead. CardText originally used P."
-        )

dash_bootstrap_components/_table.py

@@ -2,7 +2,7 @@
 from itertools import groupby
 from operator import add
 
-import dash_html_components as html
+from dash import html
 
 
 def _generate_table_from_df(

dash_bootstrap_components/icons.py

@@ -0,0 +1,5 @@
+BOOTSTRAP = (
+    "https://cdn.jsdelivr.net/npm/[email protected]/"
+    "font/bootstrap-icons.css"
+)
+FONT_AWESOME = "https://use.fontawesome.com/releases/v5.15.4/css/all.css"

dash_bootstrap_components/themes.py

@@ -1,10 +1,10 @@
 BOOTSTRAP = (
-    "https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css"
+    "https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
 )
 
-GRID = "https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap-grid.min.css"  # noqa
+GRID = "https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap-grid.min.css"  # noqa
 
-_BOOTSWATCH_BASE = "https://stackpath.bootstrapcdn.com/bootswatch/4.5.2/"
+_BOOTSWATCH_BASE = "https://cdn.jsdelivr.net/npm/[email protected]/dist/"
 
 CERULEAN = _BOOTSWATCH_BASE + "cerulean/bootstrap.min.css"
 COSMO = _BOOTSWATCH_BASE + "cosmo/bootstrap.min.css"
@@ -17,7 +17,9 @@
 LUX = _BOOTSWATCH_BASE + "lux/bootstrap.min.css"
 MATERIA = _BOOTSWATCH_BASE + "materia/bootstrap.min.css"
 MINTY = _BOOTSWATCH_BASE + "minty/bootstrap.min.css"
+MORPH = _BOOTSWATCH_BASE + "morph/bootstrap.min.css"
 PULSE = _BOOTSWATCH_BASE + "pulse/bootstrap.min.css"
+QUARTZ = _BOOTSWATCH_BASE + "quartz/bootstrap.min.css"
 SANDSTONE = _BOOTSWATCH_BASE + "sandstone/bootstrap.min.css"
 SIMPLEX = _BOOTSWATCH_BASE + "simplex/bootstrap.min.css"
 SKETCHY = _BOOTSWATCH_BASE + "sketchy/bootstrap.min.css"
@@ -26,4 +28,6 @@
 SPACELAB = _BOOTSWATCH_BASE + "spacelab/bootstrap.min.css"
 SUPERHERO = _BOOTSWATCH_BASE + "superhero/bootstrap.min.css"
 UNITED = _BOOTSWATCH_BASE + "united/bootstrap.min.css"
+VAPOR = _BOOTSWATCH_BASE + "vapor/bootstrap.min.css"
 YETI = _BOOTSWATCH_BASE + "yeti/bootstrap.min.css"
+ZEPHYR = _BOOTSWATCH_BASE + "zephyr/bootstrap.min.css"

demo/Demo.js

@@ -110,7 +110,7 @@ const Demo = () => (
         <DropdownMenuItem>Entry 3</DropdownMenuItem>
       </DropdownMenu>
     </NavbarSimple>
-    <Container className="mt-3">
+    <Container class_name="mt-3">
       <h1>Dash Bootstrap Components - Demo</h1>
       <p>
         This demonstrates all of the Dash Bootstrap Components as React

demo/index.html

@@ -6,8 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link
       rel="stylesheet"
-      href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
-      integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2"
+      href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
       crossorigin="anonymous"
     />
   </head>