save state

Author: cvanelteren

.github/workflows/build-ultraplot.yml

@@ -43,7 +43,7 @@ jobs:
 
       - name: Test Ultraplot
         run: |
-          pytest -n auto --cov=ultraplot --cov-branch --cov-report term-missing --cov-report=xml ultraplot
+          pytest --cov=ultraplot --cov-branch --cov-report term-missing --cov-report=xml ultraplot
 
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v5
@@ -76,14 +76,14 @@ jobs:
           git fetch origin ${{ github.event.pull_request.base.sha }}
           git checkout ${{ github.event.pull_request.base.sha }}
           python -c "import ultraplot as plt; plt.config.Configurator()._save_yaml('ultraplot.yml')"
-          pytest -n auto -W ignore --mpl-generate-path=baseline --mpl-default-style="./ultraplot.yml"
+          pytest -W ignore --mpl-generate-path=baseline --mpl-default-style="./ultraplot.yml"
           git checkout ${{ github.sha }}  # Return to PR branch
 
       - name: Image Comparison Ultraplot
         run: |
           mkdir -p results
           python -c "import ultraplot as plt; plt.config.Configurator()._save_yaml('ultraplot.yml')"
-          pytest -n auto -W ignore --mpl --mpl-baseline-path=baseline --mpl-generate-summary=html --mpl-results-path=./results/ --mpl-default-style="./ultraplot.yml" --store-failed-only ultraplot/tests
+          pytest -W ignore --mpl --mpl-baseline-path=baseline --mpl-generate-summary=html --mpl-results-path=./results/ --mpl-default-style="./ultraplot.yml" --store-failed-only ultraplot/tests
 
       # Return the html output of the comparison even if failed
       - name: Upload comparison failures

environment.yml

@@ -2,32 +2,31 @@ name: ultraplot-dev
 channels:
   - conda-forge
 dependencies:
-  - basemap >=1.4.1
-  - cartopy
-  - jupyter
-  - jupytext
-  - matplotlib>=3.9
-  - nbsphinx
-  - networkx
+  - python>=3.10,<3.14
   - numpy
+  - matplotlib>=3.9
+  - cartopy
+  - xarray
+  - seaborn
   - pandas
-  - pint
-  - pip
-  - pre-commit
-  - pyarrow
   - pytest
-  - pytest-cov
   - pytest-mpl
-  - pytest-xdist
-  - python>=3.10,<3.14
-  - seaborn
+  - pytest-cov
+  - jupyter
+  - pip
+  - pint
   - sphinx
+  - nbsphinx
+  - jupytext
+  - sphinx-copybutton
   - sphinx-autoapi
   - sphinx-automodapi
-  - sphinx-copybutton
-  - sphinx-design
   - sphinx-rtd-theme
   - typing-extensions
-  - xarray
+  - basemap >=1.4.1
+  - pre-commit
+  - sphinx-design
+  - networkx
+  - pyarrow
   - pip:
       - git+https://github.com/ultraplot/UltraTheme.git

ultraplot/config.py

@@ -841,6 +841,19 @@ def __delitem__(self, key):  # noqa: U100
     def __delattr__(self, attr):  # noqa: U100
         raise RuntimeError("rc settings cannot be deleted.")
 
+<<<<<<< HEAD
+=======
+    @docstring._snippet_manager
+    def __init__(self, local=True, user=True, default=True, **kwargs):
+        """
+        Parameters
+        ----------
+        %(rc.params)s
+        """
+        self._context = []
+        self._init(local=local, user=user, default=default, **kwargs)
+
+>>>>>>> main
     def __getitem__(self, key):
         """
         Return an `rc_matplotlib` or `rc_ultraplot` setting using dictionary notation
@@ -859,8 +872,13 @@ def __setitem__(self, key, value):
         (e.g., ``uplt.rc[name] = value``).
         """
         kw_ultraplot, kw_matplotlib = self._get_item_dicts(key, value)
+<<<<<<< HEAD
         self.rc_ultraplot.update(kw_ultraplot)
         self.rc_matplotlib.update(kw_matplotlib)
+=======
+        rc_ultraplot.update(kw_ultraplot)
+        rc_matplotlib.update(kw_matplotlib)
+>>>>>>> main
 
     def __getattr__(self, attr):
         """
@@ -902,7 +920,11 @@ def __enter__(self):
                 raise e
 
             for rc_dict, kw_new in zip(
+<<<<<<< HEAD
                 (self.rc_ultraplot, self.rc_matplotlib),
+=======
+                (rc_ultraplot, rc_matplotlib),
+>>>>>>> main
                 (kw_ultraplot, kw_matplotlib),
             ):
                 for key, value in kw_new.items():
@@ -920,11 +942,55 @@ def __exit__(self, *args):  # noqa: U100
         context = self._context[-1]
         for key, value in context.rc_old.items():
             kw_ultraplot, kw_matplotlib = self._get_item_dicts(key, value)
+<<<<<<< HEAD
             self.rc_ultraplot.update(kw_ultraplot)
             self.rc_matplotlib.update(kw_matplotlib)
         del self._context[-1]
 
     def _validate_key(self, key, value=None):
+=======
+            rc_ultraplot.update(kw_ultraplot)
+            rc_matplotlib.update(kw_matplotlib)
+        del self._context[-1]
+
+    def _init(self, *, local, user, default, skip_cycle=False):
+        """
+        Initialize the configurator.
+        """
+        # Always remove context objects
+        self._context.clear()
+
+        # Update from default settings
+        # NOTE: see _remove_blacklisted_style_params bugfix
+        if default:
+            rc_matplotlib.update(_get_style_dict("original", filter=False))
+            rc_matplotlib.update(rcsetup._rc_matplotlib_default)
+            rc_ultraplot.update(rcsetup._rc_ultraplot_default)
+            for key, value in rc_ultraplot.items():
+                kw_ultraplot, kw_matplotlib = self._get_item_dicts(
+                    key, value, skip_cycle=skip_cycle
+                )
+                rc_matplotlib.update(kw_matplotlib)
+                rc_ultraplot.update(kw_ultraplot)
+
+        # Update from user home
+        user_path = None
+        if user:
+            user_path = self.user_file()
+            if os.path.isfile(user_path):
+                self.load(user_path)
+
+        # Update from local paths
+        if local:
+            local_paths = self.local_files()
+            for path in local_paths:
+                if path == user_path:  # local files always have precedence
+                    continue
+                self.load(path)
+
+    @staticmethod
+    def _validate_key(key, value=None):
+>>>>>>> main
         """
         Validate setting names and handle `rc_ultraplot` deprecations.
         """
@@ -971,9 +1037,15 @@ def _get_item_context(self, key, mode=None):
             mode = self._context_mode
         cache = tuple(context.rc_new for context in self._context)
         if mode == 0:
+<<<<<<< HEAD
             rcdicts = (*cache, self.rc_ultraplot, self.rc_matplotlib)
         elif mode == 1:
             rcdicts = (*cache, self.rc_ultraplot)  # added settings only!
+=======
+            rcdicts = (*cache, rc_ultraplot, rc_matplotlib)
+        elif mode == 1:
+            rcdicts = (*cache, rc_ultraplot)  # added settings only!
+>>>>>>> main
         elif mode == 2:
             rcdicts = (*cache,)
         else:

ultraplot/internals/context.py

@@ -2,7 +2,6 @@
 """
 Utilities for manging context.
 """
-import threading
 from . import ic  # noqa: F401
 
 
@@ -26,10 +25,6 @@ class _state_context(object):
     Temporarily modify attribute(s) for an arbitrary object.
     """
 
-    _lock = (
-        threading.RLock()
-    )  # class-wide reentrant lock (or use instance-wide if needed)
-
     def __init__(self, obj, **kwargs):
         self._obj = obj
         self._attrs_new = kwargs
@@ -38,14 +33,12 @@ def __init__(self, obj, **kwargs):
         }
 
     def __enter__(self):
-        self._lock.acquire()
         for key, value in self._attrs_new.items():
             setattr(self._obj, key, value)
 
-    def __exit__(self, *args):
+    def __exit__(self, *args):  # noqa: U100
         for key in self._attrs_new.keys():
             if key in self._attrs_prev:
                 setattr(self._obj, key, self._attrs_prev[key])
             else:
                 delattr(self._obj, key)
-        self._lock.release()

ultraplot/internals/rcsetup.py

@@ -541,7 +541,7 @@ def __init__(self, source, validate):
     def _validate(self):
         if not hasattr(self._thread_props, "_validate"):
             self._thread_props._validate = _rc_ultraplot_validate
-        return self._thread_props._validate
+        return self._thread_props._validate.copy()
 
     @_validate.setter
     def _validate(self, value):
@@ -607,9 +607,8 @@ def copy(self):
         if validate is None:
             # fallback: guess it from another thread (e.g., first one that set it)
             validate = dict()
-
         source = dict(self)
-        return _RcParams(source, validate)
+        return _RcParams(source.copy(), validate.copy())
 
 
 # Borrow validators from matplotlib and construct some new ones