Skip to content

Commit 431ad37

Browse files
luigifabluigifab
committed
Version 1.2.1
1 parent 6a9171f commit 431ad37

12 files changed

Lines changed: 83 additions & 79 deletions

File tree

‎README.md‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,17 @@ It require *libusb*, *pyusb* and *pyserial*.
2020

2121
* Debian and Ubuntu: `sudo apt install python3-radexreader radexreader` (coming soon or via [PPA](https://launchpad.net/~luigifab/+archive/ubuntu/packages))
2222

23-
* Fedora: `sudo dnf install python3-radexreader` (coming soon)
23+
* Fedora: `sudo dnf install python3-radexreader`
2424

25-
* OpenSuse: `sudo zypper install python3-radexreader`
25+
* openSUSE: `sudo zypper install python3-radexreader`
2626

2727
* Linux: `sudo python3 -m pip install radexreader` (+libusb)
2828

2929
* Mac: `sudo pip install radexreader` (+libusb)
3030

3131
* Windows: `python -m pip install radexreader` (+[libusb](https://libusb.info/), put libusb-1.0.dll in system32)
3232

33-
* Docker Alpine: `sudo docker run --rm --user root -it --privileged -v /dev:/dev python:3.x-alpine /bin/sh`\
34-
then: `apk update ; apk add libusb ; python3 -m pip install radexreader`
33+
* Docker Alpine: `sudo docker run --rm --user root -it --privileged -v /dev:/dev python:3.x-alpine /bin/sh` then: `apk update ; apk add libusb ; python3 -m pip install radexreader`
3534

3635
## PPA
3736

@@ -62,15 +61,15 @@ pub rsa4096 2020-10-31 [SC]
6261

6362
## Copyright
6463

65-
- Current version: 1.2.0 (05/05/2021)
66-
- Compatibility: Python 3.3 / 3.4 / 3.5 / 3.6 / 3.7 / 3.8 / 3.9
64+
- Current version: 1.2.1 (09/09/2021)
65+
- Compatibility: Python 3.3 / 3.4 / 3.5 / 3.6 / 3.7 / 3.8 / 3.9 / 3.10
6766
- Links: [luigifab.fr](https://www.luigifab.fr/python/radexreader) - [github.com](https://github.com/luigifab/python-radexreader) - [pypi.org](https://pypi.org/project/radexreader/)\
68-
[debian python-radexreader.deb](https://tracker.debian.org/pkg/python3-radexreader)
67+
[Debian python-radexreader.deb](https://tracker.debian.org/pkg/python3-radexreader)
6968
*([ITP](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=973447),
7069
[RFS](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=974217))*\
71-
[fedora python-radexreader.rpm](https://src.fedoraproject.org/rpms/python3-radexreader)\
72-
[opensuse python-radexreader.rpm](https://software.opensuse.org/package/python-radexreader)\
73-
[ubuntu PPA](https://launchpad.net/~luigifab/+archive/ubuntu/packages)
70+
[Fedora python-radexreader.rpm](https://src.fedoraproject.org/rpms/python3-radexreader)\
71+
[openSUSE python-radexreader.rpm](https://software.opensuse.org/package/python-radexreader)\
72+
[Ubuntu PPA](https://launchpad.net/~luigifab/+archive/ubuntu/packages)
7473

7574
This program is provided under the terms of the **GNU GPLv2+** license.\
7675
If you like, take some of your time to improve some translations, go to https://bit.ly/2HyCCEc.

‎debian/changelog‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
python-radexreader (1.2.0-1) unstable; urgency=low
1+
python-radexreader (1.2.1-1) unstable; urgency=low
22

33
* Initial debian package release (Closes: #973447)
44

5-
-- Fabrice Creuzot <code@luigifab.fr> Wed, 05 May 2021 20:00:00 +0000
5+
-- Fabrice Creuzot <code@luigifab.fr> Thu, 09 Sep 2021 20:00:00 +0000

‎debian/control‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Vcs-Git: https://github.com/luigifab/python-radexreader.git
1212
Package: python3-radexreader
1313
Architecture: all
1414
Depends: ${misc:Depends}, ${python3:Depends}, python3-serial, python3-usb
15-
Description: Reader for the RADEX RD1212 and ONE Geiger counters (Python module)
15+
Description: reader for the RADEX RD1212 and ONE Geiger counters (Python module)
1616
The RadexReader is an user-space driver for the RADEX RD1212 and
1717
the RADEX ONE Geiger counters. It allow to read and clear stored
1818
data via USB.
@@ -23,7 +23,7 @@ Description: Reader for the RADEX RD1212 and ONE Geiger counters (Python module)
2323
Package: radexreader
2424
Architecture: all
2525
Depends: ${misc:Depends}, ${python3:Depends}, python3-radexreader
26-
Description: Reader for the RADEX RD1212 and ONE Geiger counters (CLI)
26+
Description: reader for the RADEX RD1212 and ONE Geiger counters (CLI)
2727
The RadexReader is an user-space driver for the RADEX RD1212 and
2828
the RADEX ONE Geiger counters. It allow to read and clear stored
2929
data via USB.

‎debian/deb.sh‎

Lines changed: 23 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44

55
cd "$(dirname "$0")"
6-
version="1.2.0"
6+
version="1.2.1"
77

88

99
rm -rf builder/
@@ -12,41 +12,41 @@ mkdir builder
1212
# copy to a tmp directory
1313
if [ true ]; then
1414
cd builder
15-
wget https://github.com/luigifab/python-radexreader/archive/v${version}/python-radexreader-${version}.tar.gz
16-
tar xzf python-radexreader-${version}.tar.gz
15+
wget https://github.com/luigifab/python-radexreader/archive/v$version/python-radexreader-$version.tar.gz
16+
tar xzf python-radexreader-$version.tar.gz
1717
cd ..
1818
else
19-
temp=python-radexreader-${version}
20-
mkdir /tmp/${temp}
21-
cp -r ../* /tmp/${temp}/
22-
rm -rf /tmp/${temp}/*/builder/ /tmp/${temp}/radexreader/__pycache__/
19+
temp=python-radexreader-$version
20+
mkdir /tmp/$temp
21+
cp -r ../* /tmp/$temp/
22+
rm -rf /tmp/$temp/*/builder/ /tmp/$temp/radexreader/__pycache__/
2323

24-
mv /tmp/${temp} builder/
25-
cp /usr/share/common-licenses/GPL-2 builder/${temp}/LICENSE
24+
mv /tmp/$temp builder/
25+
cp /usr/share/common-licenses/GPL-2 builder/$temp/LICENSE
2626

2727
cd builder/
28-
tar czf ${temp}.tar.gz ${temp}
28+
tar czf $temp.tar.gz $temp
2929
cd ..
3030
fi
3131

3232

3333
# create packages for debian and ubuntu
34-
for serie in unstable impish hirsute groovy focal bionic xenial trusty precise; do
34+
for serie in unstable impish hirsute focal bionic xenial trusty; do
3535

3636
if [ $serie = "unstable" ]; then
3737
# for ubuntu
38-
cp -a builder/python-radexreader-${version}/ builder/python-radexreader-${version}+src/
38+
cp -a builder/python-radexreader-$version/ builder/python-radexreader-$version+src/
3939
# debian only
40-
cd builder/python-radexreader-${version}/
40+
cd builder/python-radexreader-$version/
4141
else
4242
# ubuntu only
43-
cp -a builder/python-radexreader-${version}+src/ builder/python-radexreader-${version}+${serie}/
44-
cd builder/python-radexreader-${version}+${serie}/
43+
cp -a builder/python-radexreader-$version+src/ builder/python-radexreader-$version+$serie/
44+
cd builder/python-radexreader-$version+$serie/
4545
fi
4646

47-
dh_make -a -s -y -f ../python-radexreader-${version}.tar.gz -p python-radexreader
47+
dh_make -a -s -y -f ../python-radexreader-$version.tar.gz -p python-radexreader
4848

49-
rm -f debian/*ex debian/*EX debian/README* debian/*doc*
49+
rm -f debian/*ex debian/*EX debian/README* debian/*doc* debian/deb.sh
5050
mkdir debian/upstream
5151
mv debian/metadata debian/upstream/metadata
5252
mv debian/udev debian/python3-radexreader.udev
@@ -56,7 +56,7 @@ for serie in unstable impish hirsute groovy focal bionic xenial trusty precise;
5656
if [ $serie = "unstable" ]; then
5757
dpkg-buildpackage -us -uc
5858
else
59-
# debhelper: unstable:13 hirsute:13 groovy:13 focal:12 bionic:9 xenial:9 trusty:9 precise:9
59+
# debhelper: unstable:13 hirsute:13 focal:12 bionic:9 xenial:9 trusty:9
6060
if [ $serie = "focal" ]; then
6161
sed -i 's/debhelper-compat (= 13)/debhelper-compat (= 12)/g' debian/control
6262
fi
@@ -73,27 +73,21 @@ for serie in unstable impish hirsute groovy focal bionic xenial trusty precise;
7373
sed -i ':a;N;$!ba;s/Rules-Requires-Root: no\n//g' debian/control
7474
echo 9 > debian/compat
7575
fi
76-
if [ $serie = "precise" ]; then
77-
sed -i 's/debhelper-compat (= 13)/debhelper (>= 9)/g' debian/control
78-
sed -i ':a;N;$!ba;s/Rules-Requires-Root: no\n//g' debian/control
79-
sed -i 's/, dh-python//g' debian/control
80-
echo 9 > debian/compat
81-
fi
82-
sed -i 's/unstable/'${serie}'/g' debian/changelog
83-
sed -i 's/-1) /-1+'${serie}') /' debian/changelog
76+
sed -i 's/unstable/'$serie'/g' debian/changelog
77+
sed -i 's/-1) /-1+'$serie') /' debian/changelog
8478
dpkg-buildpackage -us -uc -ui -d -S
8579
fi
8680
echo "==========================="
8781
cd ..
8882

8983
if [ $serie = "unstable" ]; then
9084
# debian only
91-
debsign python-radexreader_${version}-*.changes
85+
debsign python-radexreader_$version-*.changes
9286
echo "==========================="
93-
lintian -EviIL +pedantic python-radexreader_${version}-*.deb
87+
lintian -EviIL +pedantic python-radexreader_$version-*.deb
9488
else
9589
# ubuntu only
96-
debsign python-radexreader_${version}*+${serie}*source.changes
90+
debsign python-radexreader_$version*+$serie*source.changes
9791
fi
9892
echo "==========================="
9993
cd ..

‎fedora/python-radexreader.spec‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Pour éviter un Access denied (insufficient permissions), n'oubliez pas
1818
de débrancher l'appareil après l'installation.}
1919

2020
Name: python-radexreader
21-
Version: 1.2.0
21+
Version: 1.2.1
2222
Release: 1%{?dist}
2323
Summary: %{common_summary_en}
2424
Summary(fr): %{common_summary_fr}
@@ -39,6 +39,7 @@ Summary: %{common_summary_en}
3939
Summary(fr): %{common_summary_fr}
4040

4141
BuildRequires: python3-devel
42+
BuildRequires: python3-setuptools
4243
Requires: python3
4344
Requires: %{py3_dist pyserial}
4445
Requires: %{py3_dist pyusb}
@@ -67,12 +68,15 @@ install -p -m 755 ../src/radexreader.py %{buildroot}%{_bindir}/radexreader
6768
%files -n python3-radexreader
6869
%license LICENSE
6970
%doc README.md
70-
%{_bindir}/radexreader
71+
%ghost %{python3_sitelib}/radexreader*egg-info/
7172
%{python3_sitelib}/radexreader/
72-
%{python3_sitelib}/radexreader*egg-info/
73+
%{_bindir}/radexreader
7374
/lib/udev/rules.d/60-python3-radexreader.rules
7475

7576

7677
%changelog
78+
* Thu Sep 09 2021 Fabrice Creuzot <code@luigifab.fr> - 1.2.1-1
79+
- New upstream version
80+
7781
* Wed May 05 2021 Fabrice Creuzot <code@luigifab.fr> - 1.2.0-1
78-
- Initial fedora package release (Closes: rhbz#1896742)
82+
- Initial Fedora package release (Closes: rhbz#1896742)

‎fedora/rpm.sh‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/bash
2-
# fedora: sudo dnf install rpmdevtools rpm-sign python3-devel hunspell-fr
3-
# fedora: configure: error: C compiler cannot create executables? remove and reinstall glibc-devel gcc
2+
# Fedora: sudo dnf install rpmdevtools rpm-sign python3-devel hunspell-fr
3+
# Fedora: configure: error: C compiler cannot create executables? remove and reinstall glibc-devel gcc
44

55
cd "$(dirname "$0")"
6-
version="1.2.0"
6+
version="1.2.1"
77

88

99
rm -rf builder/ ~/rpmbuild/
@@ -14,19 +14,19 @@ if [ true ]; then
1414
chmod 644 python-radexreader.spec
1515
spectool -g -R python-radexreader.spec
1616
else
17-
temp=python-radexreader-${version}
18-
mkdir /tmp/${temp}
19-
cp -r ../* /tmp/${temp}/
20-
rm -rf /tmp/${temp}/*/builder/ /tmp/${temp}/radexreader/__pycache__/
17+
temp=python-radexreader-$version
18+
mkdir /tmp/$temp
19+
cp -r ../* /tmp/$temp/
20+
rm -rf /tmp/$temp/*/builder/ /tmp/$temp/radexreader/__pycache__/
2121

22-
mv /tmp/${temp} builder/
23-
cp /usr/share/licenses/linux-firmware/GPL-2 builder/${temp}/LICENSE
22+
mv /tmp/$temp builder/
23+
cp /usr/share/licenses/linux-firmware/GPL-2 builder/$temp/LICENSE
2424

2525
cd builder/
26-
tar czf ${temp}.tar.gz ${temp}
26+
tar czf $temp.tar.gz $temp
2727
cd ..
2828

29-
cp builder/${temp}.tar.gz ~/rpmbuild/SOURCES/python-radexreader-${version}.tar.gz
29+
cp builder/$temp.tar.gz ~/rpmbuild/SOURCES/python-radexreader-$version.tar.gz
3030
chmod 644 python-radexreader.spec
3131
fi
3232

‎opensuse/python-radexreader.spec‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
22
Name: python-radexreader
3-
Version: 1.2.0
3+
Version: 1.2.1
44
Release: 0
55
Summary: Reader for the RADEX RD1212 and ONE Geiger counters
66
License: GPL-2.0-or-later
@@ -64,8 +64,11 @@ install -p -m 755 ../src/radexreader.py %{buildroot}%{_bindir}/radexreader
6464

6565

6666
%changelog
67+
* Thu Sep 09 2021 Fabrice Creuzot <code@luigifab.fr> - 1.2.1-1
68+
- New upstream version
69+
6770
* Wed May 05 2021 Fabrice Creuzot <code@luigifab.fr> - 1.2.0-1
6871
- New upstream version
6972

7073
* Sun Apr 04 2021 Fabrice Creuzot <code@luigifab.fr> - 1.1.0-1
71-
- Initial opensuse package release
74+
- Initial openSUSE package release

‎opensuse/rpm.sh‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/bash
2-
# opensuse: sudo zypper install rpmdevtools rpmlint rpm-build python3-devel aspell-fr
2+
# openSUSE: sudo zypper install rpmdevtools rpmlint rpm-build python3-devel aspell-fr
33

44

55
cd "$(dirname "$0")"
6-
version="1.2.0"
6+
version="1.2.1"
77

88

99
rm -rf builder/ ~/rpmbuild/
@@ -14,19 +14,19 @@ if [ true ]; then
1414
chmod 644 python-radexreader.spec
1515
spectool -g -R python-radexreader.spec
1616
else
17-
temp=python-radexreader-${version}
18-
mkdir /tmp/${temp}
19-
cp -r ../* /tmp/${temp}/
20-
rm -rf /tmp/${temp}/*/builder/ /tmp/${temp}/radexreader/__pycache__/
17+
temp=python-radexreader-$version
18+
mkdir /tmp/$temp
19+
cp -r ../* /tmp/$temp/
20+
rm -rf /tmp/$temp/*/builder/ /tmp/$temp/radexreader/__pycache__/
2121

22-
mv /tmp/${temp} builder/
23-
cp /usr/share/licenses/kernel-firmware/GPL-2 builder/${temp}/LICENSE
22+
mv /tmp/$temp builder/
23+
cp /usr/share/licenses/kernel-firmware/GPL-2 builder/$temp/LICENSE
2424

2525
cd builder/
26-
tar czf ${temp}.tar.gz ${temp}
26+
tar czf $temp.tar.gz $temp
2727
cd ..
2828

29-
cp builder/${temp}.tar.gz ~/rpmbuild/SOURCES/python-radexreader-${version}.tar.gz
29+
cp builder/$temp.tar.gz ~/rpmbuild/SOURCES/python-radexreader-$version.tar.gz
3030
chmod 644 python-radexreader.spec
3131
fi
3232

‎pypi/pypi.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/bash
2-
# debian: sudo apt install python3-pip python3-setuptools
3-
# fedora: sudo dnf install python3-devel
2+
# Debian: sudo apt install python3-pip python3-setuptools
3+
# Fedora: sudo dnf install python3-devel
44

55
cd "$(dirname "$0")"
6-
version="1.2.0"
6+
version="1.2.1"
77
rm -rf builder/
88

99

‎src/radexreader.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/python3
22
# -*- coding: utf8 -*-
33
# Created L/19/10/2020
4-
# Updated D/02/05/2021
4+
# Updated J/06/05/2021
55
#
66
# Copyright 2020-2021 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
77
# https://github.com/luigifab/python-radexreader
@@ -24,6 +24,10 @@
2424
import usb
2525
import serial
2626

27+
# https://stackoverflow.com/a/62804772/2980105
28+
# prevent auto import for "import radexreader"when filename is "radexreader.py"
29+
sys.path = sys.path[1:]
30+
2731
try:
2832
import radexreader
2933
msg = 'Information python3-radexreader ' + radexreader.__version__

0 commit comments

Comments
 (0)