bumped version, python3 now working, deprecated python build replaced with pybuild
This commit is contained in:
Vendored
+10
-1
@@ -1,4 +1,13 @@
|
|||||||
python3-damaris (0.18.2) UNRELEASED; urgency=medium
|
python3-damaris (0.19) stable; urgency=medium
|
||||||
|
|
||||||
|
* JBs python3-damaris code adapted to new python3 syntax
|
||||||
|
* debian/rules using pybuild
|
||||||
|
* debian pacakaging upgraded to new version, removed deprectated stuff
|
||||||
|
* version bump
|
||||||
|
|
||||||
|
-- Markus Rosenstihl <markus.rosenstihl@pkm.tu-darmstadt.de> Mon, 09 Mar 2026 15:15:34 +0100
|
||||||
|
|
||||||
|
python3-damaris (0.18.2) stable; urgency=medium
|
||||||
|
|
||||||
* Experiment queuing implemented
|
* Experiment queuing implemented
|
||||||
* Joachim Beerwerths (JB) fixes merged
|
* Joachim Beerwerths (JB) fixes merged
|
||||||
|
|||||||
Vendored
+1
-1
@@ -1 +1 @@
|
|||||||
9
|
10
|
||||||
|
|||||||
Vendored
+5
-5
@@ -1,16 +1,16 @@
|
|||||||
Source: python3-damaris
|
Source: python3-damaris
|
||||||
Section: science
|
Section: science
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Maintainer: Markus Rosenstihl <markus.rosenstihl@physik.tu-darmstadt.de>
|
Maintainer: Markus Rosenstihl <markus.rosenstihl@pkm.tu-darmstadt.de>
|
||||||
Build-Depends: debhelper, python3-dev, dh-python, dpkg-dev
|
Build-Depends: python3, debhelper, python3-dev, dh-sequence-python3, dpkg-dev
|
||||||
Standards-Version: 3.7.3
|
Standards-Version: 3.7.3
|
||||||
X-Python3-Version: >= 3.5
|
X-Python3-Version: >= 3.5
|
||||||
|
Rules-Requires-Root: no
|
||||||
|
|
||||||
Package: python3-damaris
|
Package: python3-damaris
|
||||||
Architecture: all
|
Architecture: all
|
||||||
XB-Python-Version: ${python3:Versions}
|
Provides: damaris-frontend-py3
|
||||||
Provides: ${python3:Provides}, damaris-frontend-py3
|
Depends: ${python3:Depends}, python3-numpy, python3-scipy, python3-gi, python3-matplotlib, python3-tables, lzop, python3-xdg, libgtksourceview-3.0-1, libgirepository1.0-dev | libgirepository-2.0-dev
|
||||||
Depends: ${python3:Depends}, python3-numpy, python3-scipy, python3-gi, python3-matplotlib, python3-tables, lzop, python3-xdg, libgtksourceview-3.0-1
|
|
||||||
Recommends: damaris-backends, python3-numpy-ext
|
Recommends: damaris-backends, python3-numpy-ext
|
||||||
Suggests: python3-doc, python3-tables-doc, python3-numpy-doc
|
Suggests: python3-doc, python3-tables-doc, python3-numpy-doc
|
||||||
Description: python frontend for DAMARIS project
|
Description: python frontend for DAMARIS project
|
||||||
|
|||||||
Vendored
+4
-52
@@ -7,58 +7,10 @@
|
|||||||
export DH_VERBOSE=1
|
export DH_VERBOSE=1
|
||||||
PYVERS=$(shell py3versions -vr)
|
PYVERS=$(shell py3versions -vr)
|
||||||
PACKAGE_NAME=python3-damaris
|
PACKAGE_NAME=python3-damaris
|
||||||
|
PYBUILD_NAME=python3-damaris
|
||||||
MODULE_NAME=damaris3
|
MODULE_NAME=damaris3
|
||||||
PYBASE=$(CURDIR)/debian/${PACKAGE_NAME}
|
PYBASE=$(CURDIR)/debian/${PACKAGE_NAME}
|
||||||
DH_ALWAYS_EXCLUDE=CVS:.svn
|
DH_ALWAYS_EXCLUDE=CVS:.git:venv
|
||||||
|
|
||||||
clean:
|
%:
|
||||||
dh_testdir
|
dh $@ --buildsystem=pybuild
|
||||||
dh_testroot
|
|
||||||
dh_installdirs
|
|
||||||
# Add here commands to clean up after the build process.
|
|
||||||
rm -f *-stamp
|
|
||||||
rm -rf dist build $(PYVERS:%=build-ext-%)
|
|
||||||
find . -name *\.py[co] -exec rm {} \;
|
|
||||||
dh_clean
|
|
||||||
|
|
||||||
build: build-stamp
|
|
||||||
build-stamp: $(PYVERS:%=build-ext-%)
|
|
||||||
touch $@
|
|
||||||
build-ext-%:
|
|
||||||
dh_testdir
|
|
||||||
python$* setup.py build
|
|
||||||
touch $@
|
|
||||||
|
|
||||||
install: install-stamp
|
|
||||||
# install menu related things
|
|
||||||
dh_install debian/damaris3.desktop /usr/share/applications/
|
|
||||||
|
|
||||||
install-stamp: build-stamp $(PYVERS:%=install-ext-%)
|
|
||||||
install-ext-%:
|
|
||||||
python$* setup.py install --root $(PYBASE) --install-layout=deb
|
|
||||||
echo "DAMARIS3 script: removing path to local installation"
|
|
||||||
-sed 's/^sys.path.insert(0,.*).*/# damaris package is found on default path/' <$(PYBASE)/usr/bin/DAMARIS3 >$(PYBASE)/usr/bin/DAMARIS3.new
|
|
||||||
-mv $(PYBASE)/usr/bin/DAMARIS3.new $(PYBASE)/usr/bin/DAMARIS3
|
|
||||||
|
|
||||||
binary-indep: build install
|
|
||||||
dh_link usr/share/python3-damaris/doc usr/share/doc/python3-damaris/html
|
|
||||||
dh_link usr/share/python3-damaris/images usr/share/doc/python3-damaris/images
|
|
||||||
dh_link usr/share/python3-damaris/images/DAMARIS3.png usr/share/icons/DAMARIS3.png
|
|
||||||
dh_testdir -i
|
|
||||||
dh_testroot -i
|
|
||||||
dh_installchangelogs -i
|
|
||||||
dh_installdocs -i
|
|
||||||
dh_python3
|
|
||||||
dh_installmenu -i
|
|
||||||
dh_compress -i -X.py
|
|
||||||
dh_fixperms -i
|
|
||||||
dh_installdeb -i
|
|
||||||
dh_gencontrol -i
|
|
||||||
dh_md5sums -i
|
|
||||||
dh_builddeb -i
|
|
||||||
|
|
||||||
binary-arch: build install
|
|
||||||
|
|
||||||
binary: binary-indep binary-arch
|
|
||||||
|
|
||||||
.PHONY: build clean binary-indep binary-arch binary install configure
|
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
sudo apt install libcairo2-dev
|
sudo apt install libcairo2-dev
|
||||||
sudo apt install python3-scipy python3-lmfit python3-matplotlib
|
sudo apt install python3-scipy python3-lmfit python3-matplotlib python3-tables python3-xdg
|
||||||
sudo apt install gir1.2-gtksource-3.0
|
sudo apt install gir1.2-gtksource-3.0
|
||||||
DEBRELEASE=$(lsb_release -cs)
|
DEBRELEASE=$(lsb_release -cs)
|
||||||
case $DEBRELEASE in
|
case $DEBRELEASE in
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ from damaris.data import DataPool, Accumulation, ADC_Result, MeasurementResult
|
|||||||
debug = False
|
debug = False
|
||||||
|
|
||||||
# version info
|
# version info
|
||||||
__version__ = "0.18.2"
|
__version__ = "0.19"
|
||||||
|
|
||||||
|
|
||||||
class logstream:
|
class logstream:
|
||||||
|
|||||||
Reference in New Issue
Block a user