Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: smheidrich/skim-unicode-table
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.1.18
Choose a base ref
...
head repository: smheidrich/skim-unicode-table
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
  • 3 commits
  • 6 files changed
  • 1 contributor

Commits on Sep 25, 2022

  1. Pin project root rust-toolchain ver. as well (#11)

    * Pin project root rust-toolchain ver. as well
    
    * Pin setuptools-rust at 0.10.6
    smheidrich authored Sep 25, 2022
    Copy the full SHA
    5941d24 View commit details

Commits on Sep 26, 2022

  1. Copy the full SHA
    3fac497 View commit details

Commits on Apr 23, 2023

  1. Build Python 3.11 wheel

    smheidrich committed Apr 23, 2023
    Copy the full SHA
    25f416e View commit details
Showing with 15 additions and 6 deletions.
  1. +2 −2 .github/workflows/build-and-prelease.yml
  2. +2 −2 .github/workflows/build-and-release.yml
  3. +1 −1 pyproject.toml
  4. +1 −0 rust-toolchain
  5. +2 −0 setup.py
  6. +7 −1 skim_unicode_table/run.sh
4 changes: 2 additions & 2 deletions .github/workflows/build-and-prelease.yml
Original file line number Diff line number Diff line change
@@ -56,11 +56,11 @@ jobs:
shell: bash # no idea why this isn't default... should be
run: |
# from: https://github.com/PyO3/setuptools-rust#build-wheelssh
for PYBIN in /opt/python/cp{37,38,39,310}*/bin; do
for PYBIN in /opt/python/cp{37,38,39,310,311}*/bin; do
# required for git commands below:
git config --global --add safe.directory /__w/skim-unicode-table/skim-unicode-table
git status
"${PYBIN}/pip" install -U setuptools wheel setuptools-rust
"${PYBIN}/pip" install -U setuptools wheel setuptools-rust==0.10.6
"${PYBIN}/python" setup.py bdist_wheel
# required to get non-dev release ver:
git reset --hard
4 changes: 2 additions & 2 deletions .github/workflows/build-and-release.yml
Original file line number Diff line number Diff line change
@@ -59,11 +59,11 @@ jobs:
shell: bash # no idea why this isn't default... should be
run: |
# from: https://github.com/PyO3/setuptools-rust#build-wheelssh
for PYBIN in /opt/python/cp{37,38,39,310}*/bin; do
for PYBIN in /opt/python/cp{37,38,39,310,311}*/bin; do
# required for git commands below:
git config --global --add safe.directory /__w/skim-unicode-table/skim-unicode-table
git status
"${PYBIN}/pip" install -U setuptools wheel setuptools-rust
"${PYBIN}/pip" install -U setuptools wheel setuptools-rust==0.10.6
"${PYBIN}/python" setup.py bdist_wheel
# required to get non-dev release ver:
git reset --hard
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = ["setuptools", "wheel", "setuptools-rust"]
requires = ["setuptools", "wheel", "setuptools-rust==0.10.6"]
1 change: 1 addition & 0 deletions rust-toolchain
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.34
2 changes: 2 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
@@ -24,6 +24,8 @@
"Environment :: Console",
"Operating System :: POSIX :: Linux",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
],
packages=["skim_unicode_table"],
rust_extensions=[
8 changes: 7 additions & 1 deletion skim_unicode_table/run.sh
Original file line number Diff line number Diff line change
@@ -7,6 +7,12 @@ SKIM_CMD="$SCRIPT_DIR/sk"
RENDER_GLYPH_CMD="$SCRIPT_DIR/render-glyph"
PRINT_TABLE_CMD="$SCRIPT_DIR/print-unicode-table"

if viu -V | grep 'viu 0'; then
viu_input_file_arg=""
else
viu_input_file_arg="-"
fi

$PRINT_TABLE_CMD \
| $SKIM_CMD -n 1,2,3,4,5,6,7 -d ' ' --with-nth 1,2 \
--preview='echo {1} | '"$RENDER_GLYPH_CMD"' | viu -w 32 ; echo {2..}'
--preview="echo {1} | '$RENDER_GLYPH_CMD' | viu -w 32 $viu_input_file_arg; echo {2..}"