Skip to content

Commit

Permalink
fix: build releases with python3
Browse files Browse the repository at this point in the history
Signed-off-by: t0b3 <[email protected]>
  • Loading branch information
t0b3 committed Jan 21, 2021
1 parent 1a1aae5 commit 31d8e52
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ PREFIX?=/usr
DISTNAME=inkscape-silhouette
EXCL=--exclude \*.orig --exclude \*.pyc
ALL=README.md *.png *.sh *.rules *.py *.inx examples misc silhouette
VERS=$$(python ./sendto_silhouette.py --version)
VERS=$$(python3 ./sendto_silhouette.py --version)

## echo '<xml height="0"/>' | python ./sendto_silhouette.py /dev/stdin
## echo python3 ./sendto_silhouette.py
# 'module' object has no attribute 'core'
# 'module' object has no attribute 'core'
# done. 0 min 0 sec
Expand All @@ -15,7 +15,7 @@ VERS=$$(python ./sendto_silhouette.py --version)
# --------
# echo > /etc/apt/sources.list.d/backports.list 'deb http://ftp.debian.org debian jessie-backports main'
# apt-get update
# apt-get -t jessie-backports install python-usb
# apt-get -t jessie-backports install python3-usb
# vi /etc/group
# lp:x:debian

Expand Down Expand Up @@ -55,7 +55,7 @@ tar_dist_classic: clean
@echo version should be $(VERS)

tar_dist:
python setup.py sdist --format=bztar
python3 setup.py sdist --format=bztar
mv dist/*.tar* .
rm -rf dist

Expand Down
6 changes: 3 additions & 3 deletions distribute/deb/description-pak
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
An inkscape extension to drive a Silhouette Cameo plotter.

Requires python-usb 1.0.0 -- if this causes errors, please try:
Requires python3-usb 1.0.0 -- if this causes errors, please try:
<pre>
sudo apt install python-pip python-setuptools
sudo pip install --upgrade pyusb
sudo apt install python3-pip python3-setuptools
sudo pip3 install --upgrade pyusb
</pre>

4 changes: 2 additions & 2 deletions distribute/deb/dist.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ name=$1
vers=$2
url=http://github.com/fablabnbg/$name
# versioned dependencies need \ escapes to survive checkinstall mangling.
# requires="python-usb\ \(\>=1.0.0\), bash"
# requires="python3-usb\ \(\>=1.0.0\), bash"

## not even ubuntu 16.04 has python-usb 1.0, we requre any python-usb
## and check at runtime again.
requires="python-usb, bash"
requires="python3-usb, bash"

tmp=../out

Expand Down
2 changes: 1 addition & 1 deletion distribute/distribute.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
echo "Determining Version:"
VERSION=$(python ../sendto_silhouette.py --version)
VERSION=$(python3 ../sendto_silhouette.py --version)

test -e /usr/bin/xpath || sudo apt-get install libxml-xpath-perl
test -e /usr/bin/checkinstall || sudo apt-get install checkinstall
Expand Down

0 comments on commit 31d8e52

Please sign in to comment.