plotnine 0.15.0a1__tar.gz → 0.15.0a2__tar.gz

{plotnine-0.15.0a1 → plotnine-0.15.0a2}/.github/workflows/documentation.yml

@@ -21,8 +21,7 @@ jobs:
           fetch-depth: 0
 
       - name: Copy build utils
-        run: |
-          cp -r .github/utils ../utils
+        run: cp -r .github/utils ../utils
 
       - name: Decide where to deploy and create output variables
         id: variables
@@ -49,47 +48,35 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v4
 
-      - name: Setup Python
-        uses: actions/setup-python@v5
+      - name: Install uv and set python version
+        uses: astral-sh/setup-uv@v6
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install a specific version of uv
-        uses: astral-sh/setup-uv@v3
-        with:
-          version: "latest"
-
-      - name: Make uv use system python
-        run: echo "UV_SYSTEM_PYTHON=true" >> $GITHUB_ENV
-
       - name: Install Quarto
         uses: quarto-dev/quarto-actions/setup@v2
         with:
           version: pre-release
 
-      - name: Install Package
-        shell: bash
-        run: |
-          make doc-deps
+      - name: Install Documentation Dependencies
+        run: |  
+          uv venv
+          make doc-dependencies
 
       - name: Environment Information
-        shell: bash
         run: |
           ls -la
           ls -la doc
           uv pip list
 
       - name: Build docs
-        shell: bash
-        run: |
-          pushd doc; make doc; popd
+        run: make doc
 
       - name: Environment Information
-        shell: bash
         run: |
           ls -la doc
-          cat doc/_variables.yml
           ls -la doc/reference
+          cat doc/_variables.yml
 
       - name: Deploy to Documentation to a Branch
         uses: JamesIves/github-pages-deploy-action@v4

{plotnine-0.15.0a1 → plotnine-0.15.0a2}/.github/workflows/release.yml

@@ -27,31 +27,20 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v4
 
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-
       - name: Install a specific version of uv
-        uses: astral-sh/setup-uv@v3
+        uses: astral-sh/setup-uv@v6
         with:
-          version: "latest"
-
-      - name: Make uv use system python
-        run: echo "UV_SYSTEM_PYTHON=true" >> $GITHUB_ENV
+          python-version: ${{ matrix.python-version }}
 
       - name: Copy build utils
-        run: |
-          cp -r .github/utils ../utils
+        run: cp -r .github/utils ../utils
 
       - name: Decide where to publish and create output variables
         id: variables
-        run: python ../utils/please.py set_publish_on
+        run: uv run python ../utils/please.py set_publish_on
 
       - name: See outputs
-        shell: bash
-        run: |
-          echo "publish_on="${{ steps.variables.outputs.publish_on }}
+        run: echo "publish_on="${{ steps.variables.outputs.publish_on }}
 
   # Ref: https://github.com/pypa/gh-action-pypi-publish
   publish:
@@ -76,21 +65,13 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v4
 
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-
       - name: Install a specific version of uv
-        uses: astral-sh/setup-uv@v3
+        uses: astral-sh/setup-uv@v6
         with:
-          version: "latest"
-
-      - name: Make uv use system python
-        run: echo "UV_SYSTEM_PYTHON=true" >> $GITHUB_ENV
+          python-version: ${{ matrix.python-version }}
 
       - name: Install Packages
-        run: uv pip install build
+        run: uv run uv pip install build
 
       - name: Build a wheel and a source tarball
         run: make dist

{plotnine-0.15.0a1 → plotnine-0.15.0a2}/.github/workflows/testing.yml

@@ -32,37 +32,25 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v4
 
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-
       - name: Install a specific version of uv
-        uses: astral-sh/setup-uv@v3
+        uses: astral-sh/setup-uv@v6
         with:
-          version: "latest"
-
-      - name: Make uv use system python
-        run: echo "UV_SYSTEM_PYTHON=true" >> $GITHUB_ENV
+          python-version: ${{ matrix.python-version }}
 
       - name: Install Packages
         run: |
           # Install as an editable so that the coverage path
           # is predicable
-          uv pip install --resolution=${{ matrix.resolution }} -e ".[extra,test]"
+          uv run uv pip install --resolution=${{ matrix.resolution }} -e ".[extra,test]"
 
       - name: Environment Information
-        run: |
-          uv pip list
+        run: uv pip list
 
       - name: Run Tests
-        run: |
-          coverage erase
-          make test
+        run: make test
 
       - name: List Directory
-        run: |
-          ls -la
+        run: ls -la
 
       - uses: actions/upload-artifact@v4
         if: failure()
@@ -96,34 +84,22 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v4
 
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-
       - name: Install a specific version of uv
-        uses: astral-sh/setup-uv@v3
+        uses: astral-sh/setup-uv@v6
         with:
-          version: "latest"
-
-      - name: Make uv use system python
-        run: echo "UV_SYSTEM_PYTHON=true" >> $GITHUB_ENV
+          python-version: ${{ matrix.python-version }}
 
       - name: Install Packages
-        run: uv tool install ruff
+        run: uv run uv pip install ruff
 
       - name: Environment Information
         run: uv pip list
 
       - name: Check lint with Ruff
-        shell: bash
-        run: |
-          make lint
+        run: make lint
 
       - name: Check format with Ruff
-        shell: bash
-        run: |
-          make format
+        run: make format
 
   typecheck:
     runs-on: ubuntu-latest
@@ -140,22 +116,13 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v4
 
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-
       - name: Install a specific version of uv
-        uses: astral-sh/setup-uv@v3
+        uses: astral-sh/setup-uv@v6
         with:
-          version: "latest"
-
-      - name: Make uv use system python
-        run: echo "UV_SYSTEM_PYTHON=true" >> $GITHUB_ENV
+          python-version: ${{ matrix.python-version }}
 
       - name: Install Packages
-        run: |
-          uv pip install ".[extra, typing]"
+        run: uv run uv pip install ".[extra, typing]"
 
       - name: Environment Information
         run: uv pip list

{plotnine-0.15.0a1 → plotnine-0.15.0a2}/.github/workflows/weekly.yml

@@ -19,31 +19,21 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v4
 
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-
       - name: Install a specific version of uv
-        uses: astral-sh/setup-uv@v3
+        uses: astral-sh/setup-uv@v6
         with:
-          version: "latest"
-
-      - name: Make uv use system python
-        run: echo "UV_SYSTEM_PYTHON=true" >> $GITHUB_ENV
+          python-version: ${{ matrix.python-version }}
 
       - name: Install Packages
         run: |
-          uv pip install ".[extra,test]"
+          uv run uv pip install ".[extra,test]"
           uv pip install --upgrade git+https://github.com/matplotlib/matplotlib
 
       - name: Environment Information
-        run: |
-          uv pip list
+        run: uv pip list
 
       - name: Run Tests
-        run: |
-          make test
+        run: make test
 
       - uses: actions/upload-artifact@v4
         if: failure()
@@ -63,32 +53,23 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v4
 
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-
       - name: Install a specific version of uv
-        uses: astral-sh/setup-uv@v3
+        uses: astral-sh/setup-uv@v6
         with:
-          version: "latest"
+          python-version: ${{ matrix.python-version }}
 
-      - name: Make uv use system python
-        run: echo "UV_SYSTEM_PYTHON=true" >> $GITHUB_ENV
 
       - name: Install Packages
         run: |
-          uv pip install ".[extra,test]"
+          uv run uv pip install ".[extra,test]"
           uv pip install --upgrade git+https://github.com/pandas-dev/pandas
 
       - name: Environment Information
-        run: |
-          uv pip list
+        run: uv pip list
 
       # to do: think about catching deprecations earlier
       - name: Run Tests
-        run: |
-          make test
+        run: make test
 
       - uses: actions/upload-artifact@v4
         if: failure()
@@ -119,31 +100,21 @@ jobs:
         with:
           ref: ${{ steps.latestrelease.outputs.latestrelease }}
 
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-
       - name: Install a specific version of uv
-        uses: astral-sh/setup-uv@v3
+        uses: astral-sh/setup-uv@v6
         with:
-          version: "latest"
-
-      - name: Make uv use system python
-        run: echo "UV_SYSTEM_PYTHON=true" >> $GITHUB_ENV
+          python-version: ${{ matrix.python-version }}
 
       - name: Install Packages
         run: |
-          uv pip install --upgrade git+https://github.com/matplotlib/matplotlib
+          uv run uv pip install --upgrade git+https://github.com/matplotlib/matplotlib
           uv pip install ".[extra,test]"
 
       - name: Environment Information
-        run: |
-          uv pip list
+        run: uv pip list
 
       - name: Run Tests
-        run: |
-          make test
+        run: make test
 
       - uses: actions/upload-artifact@v4
         if: failure()
@@ -174,32 +145,22 @@ jobs:
         with:
           ref: ${{ steps.latestrelease.outputs.latestrelease }}
 
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-
       - name: Install a specific version of uv
-        uses: astral-sh/setup-uv@v3
+        uses: astral-sh/setup-uv@v6
         with:
-          version: "latest"
-
-      - name: Make uv use system python
-        run: echo "UV_SYSTEM_PYTHON=true" >> $GITHUB_ENV
+          python-version: ${{ matrix.python-version }}
 
       - name: Install Packages
         run: |
-          uv pip install --upgrade git+https://github.com/pandas-dev/pandas
+          uv run uv pip install --upgrade git+https://github.com/pandas-dev/pandas
           uv pip install ".[extra,test]"
 
       - name: Environment Information
-        run: |
-          uv pip list
+        run: uv pip list
 
       # to do: think about catching deprecations earlier
       - name: Run Tests
-        run: |
-          make test
+        run: make test
 
       - uses: actions/upload-artifact@v4
         if: failure()
@@ -221,31 +182,21 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v4
 
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-
       - name: Install a specific version of uv
-        uses: astral-sh/setup-uv@v3
+        uses: astral-sh/setup-uv@v6
         with:
-          version: "latest"
-
-      - name: Make uv use system python
-        run: echo "UV_SYSTEM_PYTHON=true" >> $GITHUB_ENV
+          python-version: ${{ matrix.python-version }}
 
       - name: Install Packages
         run: |
-          uv pip install ".[extra,typing]"
+          uv run uv pip install ".[extra,typing]"
           uv pip install --upgrade git+https://github.com/matplotlib/matplotlib
 
       - name: Environment Information
-        run: |
-          uv pip list
+        run: uv pip list
 
       - name: Run Tests
-        run: |
-          make typecheck
+        run: make typecheck
 
   # Should mark this as can fail when feature is implemented
   # https://github.com/actions/runner/issues/2347
@@ -260,32 +211,22 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v4
 
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-
       - name: Install a specific version of uv
-        uses: astral-sh/setup-uv@v3
+        uses: astral-sh/setup-uv@v6
         with:
-          version: "latest"
-
-      - name: Make uv use system python
-        run: echo "UV_SYSTEM_PYTHON=true" >> $GITHUB_ENV
+          python-version: ${{ matrix.python-version }}
 
       - name: Install Packages
         run: |
-          uv pip install ".[extra,typing]"
+          uv run uv pip install ".[extra,typing]"
           uv pip install --upgrade git+https://github.com/pandas-dev/pandas
 
       - name: Environment Information
-        run: |
-          uv pip list
+        run: uv pip list
 
       # to do: think about catching deprecations earlier
       - name: Run Tests
-        run: |
-          make typecheck
+        run: make typecheck
 
       - uses: actions/upload-artifact@v4
         if: failure()

{plotnine-0.15.0a1 → plotnine-0.15.0a2}/.gitignore

@@ -30,6 +30,7 @@ node_modules/
 .direnv
 .venv
 venv
+uv.lock
 
 # PyInstaller
 #  Usually these files are written by a python script from a template
@@ -85,3 +86,4 @@ benchmarks
 
 # version file generated by setuptools-scm
 plotnine/_version.py
+doc/qrenderer.scss

{plotnine-0.15.0a1 → plotnine-0.15.0a2}/.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.4
+    rev: v0.11.9
     hooks:
       # Run the linter.
       - id: ruff

plotnine-0.15.0a2/Makefile

@@ -0,0 +1,125 @@
+.PHONY: clean-pyc clean-build doc clean visualize-tests build
+
+# NOTE: Take care not to use tabs in any programming flow outside the
+# make target
+
+# Use uv (if it is installed) to run all python related commands,
+# and prefere the active environment over .venv in a parent folder
+ifeq ($(OS),Windows_NT)
+  HAS_UV := $(if $(shell where uv 2>NUL),true,false)
+else
+  HAS_UV := $(if $(shell command -v uv 2>/dev/null),true,false)
+endif
+
+ifeq ($(HAS_UV),true)
+  PYTHON ?= uv run --active python
+  PIP ?= uv pip
+  UVRUN ?= uv run --active
+else
+  PYTHON ?= python
+  PIP ?= pip
+  UVRUN ?=
+endif
+
+BROWSER := $(PYTHON) -mwebbrowser
+
+all:
+	@echo "Using Python: $(PYTHON)"
+
+help:
+	@echo "clean - remove all build, test, coverage and Python artifacts"
+	@echo "clean-build - remove build artifacts"
+	@echo "clean-pyc - remove Python file artifacts"
+	@echo "clean-test - remove test and coverage artifacts"
+	@echo "lint - check style with ruff"
+	@echo "test - run tests quickly with the default Python"
+	@echo "coverage - check code coverage quickly with the default Python"
+	@echo "doc - generate HTML API documentation"
+	@echo "release - package and upload a release"
+	@echo "dist - package"
+	@echo "install - install the package to the active Python's site-packages"
+	@echo "develop - install the package in development mode"
+
+clean: clean-build clean-cache clean-test
+
+clean-build:
+	rm -fr build/
+	rm -fr dist/
+	find . -name '*.egg-info' -exec rm -fr {} +
+
+clean-cache:
+	find . -name '__pycache__' -exec rm -fr {} +
+
+clean-test:
+	$(UVRUN) coverage erase
+	rm -f coverage.xml
+	rm -fr htmlcov/
+	rm -fr tests/result_images/*
+
+format:
+	$(UVRUN) ruff format --check .
+
+format-fix:
+	$(UVRUN) ruff format .
+
+lint:
+	$(UVRUN) ruff check .
+
+lint-fix:
+	$(UVRUN) ruff check --fix .
+
+fix: format-fix lint-fix
+
+typecheck:
+	$(UVRUN) pyright
+
+test: clean-test
+	export MATPLOTLIB_BACKEND=agg
+	$(UVRUN) pytest
+
+visualize-tests:
+	$(PYTHON) tools/visualize_tests.py
+
+update-baseline-images:
+	$(PYTHON) tools/update_baseline_images.py
+
+coverage:
+	$(UVRUN) coverage report -m
+	$(UVRUN) coverage html
+	$(BROWSER) htmlcov/index.html
+
+doc:
+	$(MAKE) -C doc doc
+
+doc-preview:
+	$(MAKE) -C doc preview
+
+release-major:
+	@$(PYTHON) ./tools/release-checklist.py major
+
+release-minor:
+	@$(PYTHON) ./tools/release-checklist.py minor
+
+release-patch:
+	@$(PYTHON) ./tools/release-checklist.py patch
+
+dist: clean-build
+	$(PYTHON) -m build
+	ls -l dist
+
+build: dist
+
+install: clean
+	$(PIP) install ".[extra]"
+
+doc-dependencies:
+	$(PIP) install -e ".[doc]"
+	$(PIP) install -r requirements/doc.txt
+	$(MAKE) -C doc dependencies
+
+develop: clean-cache
+	$(PIP) install -e ".[all]"
+
+develop-update: clean-cache
+	$(PIP) install --upgrade -e ".[all]"
+	$(UVRUN) pre-commit autoupdate

{plotnine-0.15.0a1/plotnine.egg-info → plotnine-0.15.0a2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plotnine
-Version: 0.15.0a1
+Version: 0.15.0a2
 Summary: A Grammar of Graphics for Python
 Author-email: Hassan Kibirige <has2k1@gmail.com>
 License: The MIT License (MIT)
@@ -60,8 +60,11 @@ Requires-Dist: plotnine[dev]; extra == "all"
 Provides-Extra: extra
 Requires-Dist: adjustText>=1.2.0; extra == "extra"
 Requires-Dist: geopandas>=1.0.0; extra == "extra"
-Requires-Dist: scikit-learn>1.2.0; extra == "extra"
+Requires-Dist: geodatasets>=2024.8.0; extra == "extra"
+Requires-Dist: scikit-learn>=1.3.0; extra == "extra"
 Requires-Dist: scikit-misc>=0.5.1; extra == "extra"
+Requires-Dist: polars>=1.24.0; extra == "extra"
+Requires-Dist: pyarrow>=19.0.1; extra == "extra"
 Provides-Extra: doc
 Requires-Dist: jupyter; extra == "doc"
 Requires-Dist: click; extra == "doc"
@@ -79,7 +82,7 @@ Requires-Dist: twine; extra == "dev"
 Requires-Dist: plotnine[typing]; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Provides-Extra: typing
-Requires-Dist: pyright==1.1.399; extra == "typing"
+Requires-Dist: pyright==1.1.400; extra == "typing"
 Requires-Dist: ipython; extra == "typing"
 Requires-Dist: pandas-stubs; extra == "typing"
 Dynamic: license-file