v3.31.1: the Linux PC/SC headers (pyscard builds from source)
release / release (push) Waiting to run
release / release (push) Waiting to run
The first release run failed installing the test dependencies: pyscard 2.3.1 publishes macOS and Windows wheels only (no manylinux), so on Linux it always builds from source and needs the PC/SC headers - the job stopped at "winscard.h: No such file or directory". - The release workflow installs libpcsclite-dev before the dependencies. - The READMEs and setup.sh name the header package next to pcscd/ccid: libpcsclite-dev (Debian/Ubuntu), pcsc-lite-devel (Fedora), included in Arch's pcsclite. This affects every Linux user running setup, not just CI. - Version strings + the PWA cache bumped together (simple-v456). No runtime change: 997 Python + 953 frontend green; the release package test builds with the new version.
This commit is contained in:
@@ -39,6 +39,11 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
python-version: '3.12'
|
python-version: '3.12'
|
||||||
|
|
||||||
|
# pyscard has no manylinux wheels, so it builds from source on Linux
|
||||||
|
# and needs the PC/SC development headers.
|
||||||
|
- name: Install the PC/SC development headers
|
||||||
|
run: sudo apt-get update && sudo apt-get install -y libpcsclite-dev
|
||||||
|
|
||||||
- name: Install pysim and the test dependencies
|
- name: Install pysim and the test dependencies
|
||||||
working-directory: simple
|
working-directory: simple
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -739,7 +739,7 @@ The bundled Python server wraps [pySim](https://osmocom.org/projects/pysim/wiki)
|
|||||||
### Prerequisites
|
### Prerequisites
|
||||||
|
|
||||||
- **Python 3.9+** with `pip`, and **Git**
|
- **Python 3.9+** with `pip`, and **Git**
|
||||||
- **Smart card reader** (PC/SC or serial/FTDI) — PC/SC is preferable (`pcsc-lite` + `ccid` on Linux)
|
- **Smart card reader** (PC/SC or serial/FTDI) — PC/SC is preferable (`pcsc-lite` + `ccid` on Linux). `pyscard` has no Linux wheels, so it builds from source: install the PC/SC header package too (`libpcsclite-dev` on Debian/Ubuntu, `pcsc-lite-devel` on Fedora; on Arch `pcsclite` includes them).
|
||||||
- **Windows** — use Python 3.9–3.13 (3.13 recommended): `pyscard` ships precompiled wheels for these versions. On 3.14 it builds from source (needs MSVC C++ Build Tools). The SMPP bridge (`smpp.twisted3`) is intentionally skipped on Windows.
|
- **Windows** — use Python 3.9–3.13 (3.13 recommended): `pyscard` ships precompiled wheels for these versions. On 3.14 it builds from source (needs MSVC C++ Build Tools). The SMPP bridge (`smpp.twisted3`) is intentionally skipped on Windows.
|
||||||
|
|
||||||
### Scripts
|
### Scripts
|
||||||
|
|||||||
+1
-1
@@ -723,7 +723,7 @@ PWA проверяет версию сервера при подключении
|
|||||||
### Требования
|
### Требования
|
||||||
|
|
||||||
- **Python 3.9+** с `pip`, и **Git**
|
- **Python 3.9+** с `pip`, и **Git**
|
||||||
- **Смарт-картридер** (PC/SC или serial/FTDI) — предпочтителен PC/SC (`pcsc-lite` + `ccid` на Linux)
|
- **Смарт-картридер** (PC/SC или serial/FTDI) — предпочтителен PC/SC (`pcsc-lite` + `ccid` на Linux). У `pyscard` нет Linux-wheel, поэтому он собирается из исходников: поставьте и пакет с заголовками PC/SC (`libpcsclite-dev` в Debian/Ubuntu, `pcsc-lite-devel` в Fedora; в Arch они входят в `pcsclite`).
|
||||||
- **Windows** — используйте Python 3.9–3.13 (рекомендуется 3.13): у `pyscard` есть готовые wheel. На 3.14 он собирается из исходников (нужны MSVC C++ Build Tools). SMPP-мост (`smpp.twisted3`) в Windows сознательно не ставится.
|
- **Windows** — используйте Python 3.9–3.13 (рекомендуется 3.13): у `pyscard` есть готовые wheel. На 3.14 он собирается из исходников (нужны MSVC C++ Build Tools). SMPP-мост (`smpp.twisted3`) в Windows сознательно не ставится.
|
||||||
|
|
||||||
### Скрипты
|
### Скрипты
|
||||||
|
|||||||
+1
-1
@@ -1943,7 +1943,7 @@
|
|||||||
// ===== Version =====
|
// ===== Version =====
|
||||||
// Single source of truth for the PWA version: shown in the header and used
|
// Single source of truth for the PWA version: shown in the header and used
|
||||||
// by the server version check in pysimConnect().
|
// by the server version check in pysimConnect().
|
||||||
const SIMPLE_VERSION = '3.31.0';
|
const SIMPLE_VERSION = '3.31.1';
|
||||||
document.getElementById('app-version').textContent = 'v' + SIMPLE_VERSION;
|
document.getElementById('app-version').textContent = 'v' + SIMPLE_VERSION;
|
||||||
|
|
||||||
// ===== view history (the browser Back/Forward buttons) =====
|
// ===== view history (the browser Back/Forward buttons) =====
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
const CACHE = 'simple-v455';
|
const CACHE = 'simple-v456';
|
||||||
const URLS = [
|
const URLS = [
|
||||||
'index.html',
|
'index.html',
|
||||||
'help.html',
|
'help.html',
|
||||||
|
|||||||
+1
-1
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
|||||||
|
|
||||||
[project]
|
[project]
|
||||||
name = "pysim-simple-server"
|
name = "pysim-simple-server"
|
||||||
version = "3.31.0"
|
version = "3.31.1"
|
||||||
description = "HTTP REST server wrapping pysim for the SIMple PWA"
|
description = "HTTP REST server wrapping pysim for the SIMple PWA"
|
||||||
license = { text = "GPL-2.0-or-later" }
|
license = { text = "GPL-2.0-or-later" }
|
||||||
requires-python = ">=3.9"
|
requires-python = ">=3.9"
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ from osmocom.tlv import BER_TLV_IE
|
|||||||
from osmocom.utils import rpad
|
from osmocom.utils import rpad
|
||||||
|
|
||||||
|
|
||||||
VERSION = '3.31.0'
|
VERSION = '3.31.1'
|
||||||
|
|
||||||
MAX_ENVELOPE_SEGMENTS = 5 # max SMS segments for outgoing C-APDU in ENVELOPE
|
MAX_ENVELOPE_SEGMENTS = 5 # max SMS segments for outgoing C-APDU in ENVELOPE
|
||||||
|
|
||||||
|
|||||||
@@ -45,10 +45,11 @@ if command -v pcscd >/dev/null 2>&1; then
|
|||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "Note: PC/SC daemon not found. If you use a USB smart card reader,"
|
echo "Note: PC/SC daemon not found. If you use a USB smart card reader,"
|
||||||
echo "install pcsc-lite and ccid:"
|
echo "install pcsc-lite and ccid (plus the PC/SC headers that the"
|
||||||
echo " Debian/Ubuntu: sudo apt install pcscd pcsc-tools"
|
echo "pyscard build needs on Linux):"
|
||||||
echo " Arch Linux: sudo pacman -S pcsc-lite ccid"
|
echo " Debian/Ubuntu: sudo apt install pcscd pcsc-tools libpcsclite-dev"
|
||||||
echo " Fedora: sudo dnf install pcsc-lite pcsc-lite-ccid"
|
echo " Arch Linux: sudo pacman -S pcsc-lite ccid (headers included)"
|
||||||
|
echo " Fedora: sudo dnf install pcsc-lite pcsc-lite-ccid pcsc-lite-devel"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
|
|||||||
Reference in New Issue
Block a user