Skip to content

Commit e00d12d

Browse files
ElleNajtclaude
andcommitted
Clean up nix remnants after uv migration
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 0d8c90a commit e00d12d

5 files changed

Lines changed: 11 additions & 15 deletions

File tree

Readme.org

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ Tooling to safely rename variables in an org file across all python blocks that
9898

9999
To use, create a renamer.json in the same folder as your .org file, mark both with dired, and then run ob-python-extras/dired-rename-python-vars.
100100

101-
By default this runs python via nix-shell. Set the variable `alternative-python-binary` to use a different python binary (e.g., from uv or system python).
101+
By default this runs python via =uv run python=. Set the variable =alternative-python-binary= to use a different python binary.
102102

103103
** Pandoc scripts:
104104
Configured scripts for converting org files in a directory to ipynb files, or ipynb files to org files. These rely on pandoc.

python/print_org_df.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,17 @@ def disable_spark():
6262

6363
try:
6464
import pandas as pd
65-
from pandas.io.formats.style import Styler as PandasStyler
6665

6766
pd.options.display.max_rows = 20
6867
PANDAS_AVAILABLE = True
6968
except ImportError:
7069
PANDAS_AVAILABLE = False
70+
pd = None
71+
72+
try:
73+
from pandas.io.formats.style import Styler as PandasStyler
74+
except (ImportError, Exception):
7175
PandasStyler = None
72-
pass
7376

7477
try:
7578
import tabulate
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
# Last Successful test: Sat Feb 21 19:44:33 PST 2026
1+
# Last Successful test: Sat Feb 21 19:56:41 PST 2026
22
## System Information
33
Emacs version: GNU Emacs 30.2
4-
Nixpkgs commit: "26.05pre942631.fef9403a3e4d"
4+
Python: Python 3.13.2
5+
uv: uv 0.10.0

tests/run_expect_tests.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,6 @@ process_file() {
208208
echo "Processing file: $org_file"
209209

210210
# Always run the tests in staging
211-
cp *.nix "staging/"
212211
cp "$org_file" "staging/$org_file"
213212
eval "emacs $(get_emacs_args "staging/$org_file")"
214213

@@ -275,7 +274,8 @@ else
275274
echo "# Last Successful test: $(date)"
276275
echo "## System Information"
277276
echo "Emacs version: $(emacs --version | head -n1)"
278-
echo "Nixpkgs commit: $(nix-instantiate --eval -E '(import <nixpkgs> {}).lib.version' 2>/dev/null || echo "Nixpkgs not found")"
277+
echo "Python: $(python3 --version 2>/dev/null || echo "not found")"
278+
echo "uv: $(uv --version 2>/dev/null || echo "not found")"
279279
} >last_successful_test_system_info.md
280280
exit 0
281281
else

tests/test_nix_shells.sh

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)