chrys 4.2.2__tar.gz → 4.2.4__tar.gz

chrys-4.2.4/.envrc

@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+
+version_gte() {
+    local cmd="$1"
+    local required_version="$2"
+    local installed_version=$($cmd | grep -oE "[0-9]+(\.[0-9]+)+" | head -n 1)
+
+    if [ -z "$installed_version" ]; then
+        return 1
+    fi
+
+    IFS="."
+    set -- $installed_version
+    local installed_parts="$@"
+    set -- $required_version
+    local required_parts="$@"
+    unset IFS
+
+    local i=1
+    for required_part in $required_parts; do
+        installed_part=$(echo "$installed_parts" | cut -d " " -f $i)
+        if [ "${installed_part:-0}" -lt "$required_part" ]; then
+            return 1
+        elif [ "${installed_part:-0}" -gt "$required_part" ]; then
+            return 0
+        fi
+        i=$((i + 1))
+    done
+
+    return 0
+}
+
+if type nix-shell >/dev/null 2>&1; then
+    if ! has devenv; then
+        # Install devenv v1.x. Hash from https://www.nixhub.io/packages/devenv
+        if version_gte "nix --version" "2.30.0"; then
+            nix profile add github:NixOS/nixpkgs/80d901ec0377e19ac3f7bb8c035201e2e098cc97#devenv
+        else
+            nix profile install github:NixOS/nixpkgs/80d901ec0377e19ac3f7bb8c035201e2e098cc97#devenv
+        fi
+    fi
+
+    eval "$(devenv direnvrc)"
+    use devenv
+else
+    echo "nix-shell is not available. Install Nix: https://nixos.org/download"
+fi

{chrys-4.2.2 → chrys-4.2.4}/.github/workflows/ci.yaml

@@ -2,8 +2,7 @@ name: CI
 
 on:
   push:
-    branches:
-      - main
+    branches: [master]
   pull_request:
 
 jobs:
@@ -17,16 +16,15 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v4
         with:
-          node-version: "22"
-          cache: "npm"
+          node-version: 24.15.0
+          cache: npm
 
       - name: Install Node dependencies
         run: npm ci
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v7
         with:
-          version: "0.9.0"
           enable-cache: true
           cache-dependency-glob: uv.lock
 

{chrys-4.2.2 → chrys-4.2.4}/.gitignore

@@ -19,3 +19,8 @@ nbproject
 
 # GH pages
 .publish
+
+# Dev environment
+.devenv*
+.direnv
+devenv.local.nix

chrys-4.2.4/.pre-commit-config.yaml

@@ -0,0 +1,47 @@
+default_language_version:
+  node: 24.15.0
+  python: python3.13
+
+default_stages: [pre-commit]
+
+fail_fast: true
+
+repos:
+  - repo: local
+    hooks:
+      - id: nixfmt
+        name: nixfmt
+        entry: nixfmt
+        language: system
+        files: \.nix$
+
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v3.1.0
+    hooks:
+      - id: prettier
+        alias: prettier-js
+        name: prettier (js)
+        args: [--parser, babel, --write]
+        files: ^(src)/.*\.(js|jsx|cjs|mjs)$
+
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.21.2
+    hooks:
+      - id: pyupgrade
+        args: [--py313-plus]
+
+  - repo: https://github.com/pycqa/isort
+    rev: 8.0.1
+    hooks:
+      - id: isort
+        args: [--settings-path, pyproject.toml]
+
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.15.12
+    hooks:
+      - id: ruff-check
+        args: [--config, pyproject.toml]
+        stages: [manual]
+
+      - id: ruff-format
+        args: [--config, pyproject.toml]

chrys-4.2.4/.python-version

@@ -0,0 +1 @@
+3.13

chrys-4.2.4/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "python.defaultInterpreterPath": "venv/bin/python"
+}

chrys-4.2.4/Makefile

@@ -0,0 +1,92 @@
+ifneq ($(shell which tput),)
+	ifneq ($(TERM),)
+		RED    := $(shell tput setaf 1)
+		GREEN  := $(shell tput setaf 2)
+		YELLOW := $(shell tput setaf 3)
+		CYAN   := $(shell tput setaf 6)
+		RESET  := $(shell tput sgr0)
+	endif
+endif
+
+lint:
+	@echo "Linting code..."
+	pre-commit run ruff-check --hook-stage manual --all-files
+
+format:
+	@echo "Formatting code..."
+	pre-commit run prettier-js --all-files
+	pre-commit run pyupgrade --all-files
+	pre-commit run isort --all-files
+	pre-commit run ruff-format --all-files
+
+livereload:
+	node scripts/livereload.js
+
+test:
+	vitest run
+
+bump-version:
+	@BUMP=$(word 2,$(MAKECMDGOALS)); \
+	VALID_BUMP="major minor patch"; \
+	if [ -z "$$BUMP" ]; then \
+		echo "$(RED)Error: Bump is required.$(RESET)"; \
+		echo "Usage: make bump-version [major|minor|patch]"; \
+		exit 1; \
+	fi; \
+	if ! echo "$$VALID_BUMP" | grep -qw "$$BUMP"; then \
+		echo "$(RED)Error: Invalid bump '$$BUMP'.$(RESET)"; \
+		echo "Must be one of: $(CYAN)$$VALID_BUMP$(RESET)"; \
+		exit 1; \
+	fi; \
+	npm version $$BUMP; \
+	uv version --bump $$BUMP; \
+	VERSION=$$(uv version --short); \
+	git add \
+		pyproject.toml \
+		uv.lock; \
+	git commit -m $$VERSION;
+
+build-data:
+	node scripts/bokeh-palettes.js
+	node scripts/vega-palettes.js
+
+build-dist:
+	rm -fr src/css/background-color/*
+	rm -fr src/css/color/*
+	rm -f src/css/background-color.scss
+	rm -f src/css/color.scss
+	rm -fr cjs/*
+	rm -fr css/*
+	rm -fr demo/*
+	rm -fr illustrator/*
+	rm -fr umd/*
+	node scripts/build-js.js
+	node scripts/build-css.js
+	node scripts/build-illustrator.js
+	node scripts/build-demo.js
+	rm -fr build/*
+	rm -fr dist/*
+	uv build
+	twine check dist/*
+
+build-dist-and-commit:
+	@VERSION=$$(uv version --short); \
+	git add cjs css demo illustrator umd; \
+	git commit -m "Build $$VERSION";
+
+create-release:
+	@VERSION=$$(uv version --short); \
+	gh release create $$VERSION;
+
+publish:
+	npm publish
+	twine upload --config-file .pypirc --verbose dist/*
+
+deploy:
+	node scripts/deploy.js
+
+# Prevent make from treating arguments to bump-version as targets
+ifeq (bump-version,$(firstword $(MAKECMDGOALS)))
+%:
+	@:
+endif

{chrys-4.2.2 → chrys-4.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chrys
-Version: 4.2.2
+Version: 4.2.4
 Summary: A collection of color palettes for mapping and visualisation
 License-File: LICENSE
 Requires-Python: >=3.10
@@ -24,7 +24,7 @@ A collection of color palettes for visualisation in JavaScript, Python and Sass.
 npm install chrys
 ```
 
-### Python 3.10 and up
+### Python 3.13 and up
 
 ```shell
 pip install chrys
@@ -36,36 +36,49 @@ For instructions, refer to [the docs](https://netbek.github.io/chrys#usage).
 
 ## Development: Installation
 
-1. Install Node 22.x:
+1. Install Nix:
 
     ```shell
-    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
-    source ~/.bashrc
-    nvm install 22
-    nvm use 22
+    sh <(curl -L https://nixos.org/nix/install) --daemon
     ```
 
-2. Install uv:
+2. Configure Nix. Edit `/etc/nix/nix.conf` (for a multi-user installation) or `~/.config/nix/nix.conf` (for a single-user installation) to include the following lines:
 
     ```shell
-    curl -LsSf https://astral.sh/uv/install.sh | sh
+    experimental-features = nix-command flakes
+    trusted-users = root <USER>
     ```
 
-3. Create `.pypirc`:
+    Replace `<USER>` with your username on your computer.
+
+3. Install direnv:
 
     ```shell
-    cp example.pypirc .pypirc
+    sudo apt install direnv
+    ```
+
+4. Enable direnv in your shell by adding a line to your shell configuration file.
+
+    For Bash, edit `~/.bashrc`:
+
+    ```shell
+    eval "$(direnv hook bash)"
     ```
 
-4. Enter a [PyPI API token](https://pypi.org/manage/account/#api-tokens) as the password in `.pypirc`.
+5. Allow `.envrc`:
+
+    ```shell
+    direnv allow
+    ```
 
-5. Install Node and Python dependencies:
+6. Create `.pypirc`:
 
     ```shell
-    npm ci
-    uv sync
+    cp example.pypirc .pypirc
     ```
 
+7. Enter a [PyPI API token](https://pypi.org/manage/account/#api-tokens) as the password in `.pypirc`.
+
 ## Development: Usage
 
 Patch Node dependencies to fix ESM imports:
@@ -75,17 +88,21 @@ npx patch-package @bokeh/bokehjs --exclude 'nothing'
 npx patch-package vega-scale --exclude 'nothing'
 ```
 
-Build the palette data, JavaScript and Python distribution packages, Sass, CSS, Illustrator scripts:
+Build the palette data:
 
 ```shell
-npm run build-data
-npm run build-dist
+make build-data
 ```
 
-Publish the JavaScript and Python distribution packages:
+Build and publish the JavaScript and Python distribution packages:
 
 ```shell
-npm run publish-dist
+make bump-version [major|minor|patch]
+git push
+make build-dist-and-commit
+git push
+make create-release
+make publish
 ```
 
 ## Credit

{chrys-4.2.2 → chrys-4.2.4}/README.md

@@ -14,7 +14,7 @@ A collection of color palettes for visualisation in JavaScript, Python and Sass.
 npm install chrys
 ```
 
-### Python 3.10 and up
+### Python 3.13 and up
 
 ```shell
 pip install chrys
@@ -26,36 +26,49 @@ For instructions, refer to [the docs](https://netbek.github.io/chrys#usage).
 
 ## Development: Installation
 
-1. Install Node 22.x:
+1. Install Nix:
 
     ```shell
-    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
-    source ~/.bashrc
-    nvm install 22
-    nvm use 22
+    sh <(curl -L https://nixos.org/nix/install) --daemon
     ```
 
-2. Install uv:
+2. Configure Nix. Edit `/etc/nix/nix.conf` (for a multi-user installation) or `~/.config/nix/nix.conf` (for a single-user installation) to include the following lines:
 
     ```shell
-    curl -LsSf https://astral.sh/uv/install.sh | sh
+    experimental-features = nix-command flakes
+    trusted-users = root <USER>
     ```
 
-3. Create `.pypirc`:
+    Replace `<USER>` with your username on your computer.
+
+3. Install direnv:
 
     ```shell
-    cp example.pypirc .pypirc
+    sudo apt install direnv
+    ```
+
+4. Enable direnv in your shell by adding a line to your shell configuration file.
+
+    For Bash, edit `~/.bashrc`:
+
+    ```shell
+    eval "$(direnv hook bash)"
     ```
 
-4. Enter a [PyPI API token](https://pypi.org/manage/account/#api-tokens) as the password in `.pypirc`.
+5. Allow `.envrc`:
+
+    ```shell
+    direnv allow
+    ```
 
-5. Install Node and Python dependencies:
+6. Create `.pypirc`:
 
     ```shell
-    npm ci
-    uv sync
+    cp example.pypirc .pypirc
     ```
 
+7. Enter a [PyPI API token](https://pypi.org/manage/account/#api-tokens) as the password in `.pypirc`.
+
 ## Development: Usage
 
 Patch Node dependencies to fix ESM imports:
@@ -65,17 +78,21 @@ npx patch-package @bokeh/bokehjs --exclude 'nothing'
 npx patch-package vega-scale --exclude 'nothing'
 ```
 
-Build the palette data, JavaScript and Python distribution packages, Sass, CSS, Illustrator scripts:
+Build the palette data:
 
 ```shell
-npm run build-data
-npm run build-dist
+make build-data
 ```
 
-Publish the JavaScript and Python distribution packages:
+Build and publish the JavaScript and Python distribution packages:
 
 ```shell
-npm run publish-dist
+make bump-version [major|minor|patch]
+git push
+make build-dist-and-commit
+git push
+make create-release
+make publish
 ```
 
 ## Credit