Merge branch 'main' into refactor

pymc-labs · Aug 20, 2024 · 77b0b2b · 77b0b2b
2 parents 66f22aa + c80ed16
commit 77b0b2b
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 150 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -25,7 +25,7 @@ repos:
         exclude: &exclude_pattern 'iv_weak_instruments.ipynb'
         args: ["--maxkb=1500"]
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.1
+    rev: v0.6.1
     hooks:
       # Run the linter
       - id: ruff

diff --git a/causalpy/tests/test_synthetic_data.py b/causalpy/tests/test_synthetic_data.py
@@ -26,7 +26,7 @@ def test_generate_multicell_geolift_data():
     from causalpy.data.simulate_data import generate_multicell_geolift_data
 
     df = generate_multicell_geolift_data()
-    assert type(df) == pd.DataFrame
+    assert isinstance(df, pd.DataFrame)
     assert np.all(df >= 0), "Found negative values in dataset"
 
 
@@ -37,5 +37,5 @@ def test_generate_geolift_data():
     from causalpy.data.simulate_data import generate_geolift_data
 
     df = generate_geolift_data()
-    assert type(df) == pd.DataFrame
+    assert isinstance(df, pd.DataFrame)
     assert np.all(df >= 0), "Found negative values in dataset"
diff --git a/docs/source/_static/custom.css b/docs/source/_static/custom.css
diff --git a/docs/source/_static/flat_logo.png b/docs/source/_static/flat_logo.png
diff --git a/docs/source/_static/flat_logo_darkmode.png b/docs/source/_static/flat_logo_darkmode.png
diff --git a/docs/source/_templates/footer-links.html b/docs/source/_templates/footer-links.html
diff --git a/docs/source/_templates/navbar-name.html b/docs/source/_templates/navbar-name.html
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -40,6 +40,7 @@
 
 
 release = __version__
+version = release
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
@@ -132,49 +133,18 @@
 # -- Options for HTML output -------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output
 
-html_theme = "pydata_sphinx_theme"
+html_theme = "labs_sphinx_theme"
 html_static_path = ["_static"]
-html_css_files = ["custom.css"]
 html_favicon = "_static/favicon_logo.png"
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
 html_theme_options = {
     "logo": {
-        "image_light": "_static/logo.png",
-        "image_dark": "_static/logo.png",
+        "image_light": "_static/flat_logo.png",
+        "image_dark": "_static/flat_logo_darkmode.png",
     },
-    "navbar_align": "right",
-    "navbar_start": ["navbar-logo", "navbar-name"],
-    "navbar_end": ["theme-switcher"],
-    "footer_start": ["copyright", "footer-links"],
-    "footer_end": ["sphinx-version", "theme-version"],
-    "github_url": "https://github.com/pymc-labs/CausalPy",
-    "twitter_url": "https://twitter.com/pymc_labs",
-    "icon_links": [
-        {
-            "name": "LinkedIn",
-            "url": "https://www.linkedin.com/company/pymc-labs/",
-            "icon": "fa-brands fa-linkedin",
-            "type": "fontawesome",
-        },
-        {
-            "name": "MeetUp",
-            "url": "https://www.meetup.com/pymc-labs-online-meetup/",
-            "icon": "fa-brands fa-meetup",
-            "type": "fontawesome",
-        },
-        {
-            "name": "YouTube",
-            "url": "https://www.youtube.com/c/PyMCLabs",
-            "icon": "fa-brands fa-youtube",
-            "type": "fontawesome",
-        },
-    ],
-    "use_edit_page_button": True,
-    "external_links": [
-        {"name": "About PyMC Labs", "url": "https://pymc-labs.io"},
-    ],
+    "analytics": {"google_analytics_id": "G-3MCDG3M7X6"},
 }
 html_context = {
     "github_user": "pymc-labs",

diff --git a/pyproject.toml b/pyproject.toml
@@ -59,7 +59,7 @@ docs = [
     "sphinx",
     "sphinx-autodoc-typehints",
     "sphinx_autodoc_defaultargs",
-    "pydata-sphinx-theme>=0.12.0.dev0",
+    "labs-sphinx-theme @ git+https://github.com/pymc-labs/labs-sphinx-theme",
     "sphinx-copybutton",
     "sphinx-rtd-theme",
     "statsmodels",