[PATCH v3 1/2] CLI: fix traceback due unavailable display
by Petr Oros
Tuna showing traceback when user haven't set DISPLAY variable and using CLI with param -l.
This is caused by gtk library which try create "window", but in CLI mode is not neccesary.
Patch remove unnecesary library which cause this problem
Signed-off-by: Petr Oros <poros(a)redhat.com>
---
tuna/config.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tuna/config.py b/tuna/config.py
index e446447..77cc4d8 100644
--- a/tuna/config.py
+++ b/tuna/config.py
@@ -1,5 +1,5 @@
import io, os, re, fnmatch
-import sys, gtk, pygtk
+import sys, pygtk
import codecs, ConfigParser
from time import localtime, strftime
from subprocess import Popen, PIPE, STDOUT, call
--
1.8.4.2
9 years, 10 months
[PATCH] Split out oscilloscope from tuna
by David Sommerseth
This removes the dependency of tuna in the oscilloscope package and
prepares the ground for packaging oscilloscope separately later on.
Signed-off-by: David Sommerseth <davids(a)redhat.com>
---
MANIFEST | 7 ++++--
oscilloscope-cmd.py | 2 +-
tuna/oscilloscope.py => oscilloscope/__init__.py | 0
rpm/SPECS/tuna.spec | 9 +++++--
setup-oscilloscope.py | 31 ++++++++++++++++++++++++
5 files changed, 44 insertions(+), 5 deletions(-)
rename tuna/oscilloscope.py => oscilloscope/__init__.py (100%)
create mode 100644 setup-oscilloscope.py
diff --git a/MANIFEST b/MANIFEST
index 95ae7c5..16b6cad 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,10 +1,8 @@
help/kthreads/
-oscilloscope-cmd.py
tuna-cmd.py
tuna/__init__.py
tuna/help.py
tuna/sysfs.py
-tuna/oscilloscope.py
tuna/tuna.py
tuna/config.py
tuna/tuna_gui.py
@@ -28,3 +26,8 @@ ChangeLog
docs/oscilloscope+tuna.html
docs/oscilloscope+tuna.pdf
docs/tuna.8
+etc/
+org.tuna.policy
+setup-oscilloscope.py
+oscilloscope-cmd.py
+oscilloscope/
diff --git a/oscilloscope-cmd.py b/oscilloscope-cmd.py
index c6de41f..3d5ae5b 100755
--- a/oscilloscope-cmd.py
+++ b/oscilloscope-cmd.py
@@ -21,7 +21,7 @@
# USA
import getopt, sys, gtk
-from tuna import oscilloscope
+import oscilloscope
def usage():
print '''Usage: oscilloscope [OPTIONS]
diff --git a/tuna/oscilloscope.py b/oscilloscope/__init__.py
similarity index 100%
rename from tuna/oscilloscope.py
rename to oscilloscope/__init__.py
diff --git a/rpm/SPECS/tuna.spec b/rpm/SPECS/tuna.spec
index 9393df6..f82e667 100644
--- a/rpm/SPECS/tuna.spec
+++ b/rpm/SPECS/tuna.spec
@@ -3,7 +3,7 @@
Name: tuna
Version: 0.11.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2
Summary: Application tuning GUI & command line utility
Group: Applications/System
@@ -33,7 +33,6 @@ Group: Applications/System
Requires: python-matplotlib
Requires: numpy
Requires: pygtk2
-Requires: tuna = %{version}-%{release}
%description -n oscilloscope
Plots stream of values read from standard input on the screen together with
@@ -48,10 +47,12 @@ priority is changed, be it using tuna or plain chrt & taskset.
%build
%{__python} setup.py build
+%{__python} setup-oscilloscope.py build
%install
rm -rf %{buildroot}
%{__python} setup.py install --skip-build --root %{buildroot}
+%{__python} setup-oscilloscope.py install --skip-build --root %{buildroot}
mkdir -p %{buildroot}/%{_sysconfdir}/tuna/
mkdir -p %{buildroot}/{%{_bindir},%{_datadir}/tuna/help/kthreads,%{_mandir}/man8}
mkdir -p %{buildroot}/%{_datadir}/polkit-1/actions/
@@ -93,10 +94,14 @@ rm -rf %{buildroot}
%files -n oscilloscope
%defattr(-,root,root,-)
%{_bindir}/oscilloscope
+%{python_sitelib}/oscilloscope/
%doc docs/oscilloscope+tuna.html
%doc docs/oscilloscope+tuna.pdf
%changelog
+* Wed Dec 4 2013 David Sommerseth <davids(a)redhat.com> - 0.11.1-2
+- Removing tuna dependency in oscilloscope, repacking it as a separate module
+
* Fri Feb 1 2013 Arnaldo Carvalho de Melo <acme(a)redhat.com> - 0.10.4-1
- New upstream release
diff --git a/setup-oscilloscope.py b/setup-oscilloscope.py
new file mode 100644
index 0000000..730c14f
--- /dev/null
+++ b/setup-oscilloscope.py
@@ -0,0 +1,31 @@
+#!/usr/bin/python
+from distutils.sysconfig import get_python_lib
+from distutils.core import setup
+from os.path import isfile, join
+import glob
+import os
+
+#if isfile("MANIFEST"):
+# os.unlink("MANIFEST")
+
+# Get PYTHONLIB with no prefix so --prefix installs work.
+PYTHONLIB = join(get_python_lib(standard_lib=1, prefix=''), 'site-packages')
+
+setup(name="oscilloscope",
+ version = "0.11.1",
+ description = "Application tuning GUI",
+ author = "Arnaldo Carvalho de Melo",
+ author_email = "acme(a)redhat.com",
+ url = "http://userweb.kernel.org/tuna",
+ license = "GPLv2",
+ long_description =
+"""\
+Plots stream of values read from standard input on the screen together with
+statistics and a histogram.
+
+Allows to instantly see how a signal generator, such as cyclictest, signaltest
+or even ping, reacts when, for instance, its scheduling policy or real time
+priority is changed, be it using tuna or plain chrt & taskset.
+""",
+ packages = ["oscilloscope"],
+ )
--
1.8.3.1
9 years, 11 months
[PATCH] docs: Remove stray </a>
by John Kacur
Remove a stray </a> without a paired <a>. This was probably left over from
an early edit. It doesn't cause any harm for html parsers that ignore it,
but can cause complaints by tools that look for problems in xml.
Signed-off-by: John Kacur <jkacur(a)redhat.com>
---
docs/oscilloscope+tuna.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/oscilloscope+tuna.html b/docs/oscilloscope+tuna.html
index 9bba9ae..f22966f 100644
--- a/docs/oscilloscope+tuna.html
+++ b/docs/oscilloscope+tuna.html
@@ -103,7 +103,7 @@ OSADL - The Open Source Automation Development Lab
<p class="news-single-author">By: Carsten Emde (Used by permission)</p>
<h3>New versatile tools are helping us to manage real-time challenges under Linux (but you still can't tuna fish).</h3>
- <div class="news-single-img"><img src="uploads/pics/spike.gif" width="144" height="107" border="0" alt="" title="" /></a><p class="news-single-imgcaption">The "CyclictestoSCOPE" in action</p></div>
+ <div class="news-single-img"><img src="uploads/pics/spike.gif" width="144" height="107" border="0" alt="" title="" /><p class="news-single-imgcaption">The "CyclictestoSCOPE" in action</p></div>
<p class="bodytext">Do you wish you had a built-in oscilloscope that continuously displays the latency of your system? Here is one - thanks to Arnaldo Carvalho de Melo who not only wrote the <strong>oscilloscope</strong> but also the graphical process inspection and modification tool <strong>tuna</strong> that is part of the same tool package. In addition, these tools are not only very versatile tools that help us to manage real-time challenges - they also are excellent examples of the power and the beauty of the Python script language and its libraries. <br />
</p>
<p class="bodytext">However, before we can install and run these tools, we must learn a little bit about <strong>cyclictest</strong> and its command line arguments, since this is where oscilloscope gets its data from.
</p>
<h5>Cyclictest<br /></h5>
--
1.8.1.4
9 years, 12 months
[PATCH v2 1/2] CLI: fix traceback due unavailable display
by Petr Oros
Tuna showing traceback when user haven't set DISPLAY variable and using CLI with param -l.
This is caused by gtk library which try create "window", but in CLI mode is not neccesary.
Patch remove unnecesary library which cause this problem
Signed-off-by: Petr Oros <poros(a)redhat.com>
---
tuna/config.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tuna/config.py b/tuna/config.py
index e446447..77cc4d8 100644
--- a/tuna/config.py
+++ b/tuna/config.py
@@ -1,5 +1,5 @@
import io, os, re, fnmatch
-import sys, gtk, pygtk
+import sys, pygtk
import codecs, ConfigParser
from time import localtime, strftime
from subprocess import Popen, PIPE, STDOUT, call
--
1.8.4.2
9 years, 12 months
[PATCH 1/2] CLI: fix traceback due unavailable display
by Petr Oros
Tuna showing traceback when user haven't set DISPLAY variable and using CLI with param -l.
This is caused by gtk library which try create "window", but in CLI mode is not neccesary.
Patch remove unnecesary library which cause this problem
Signed-off-by: Petr Oros <poros(a)redhat.com>
---
tuna/config.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tuna/config.py b/tuna/config.py
index e446447..77cc4d8 100644
--- a/tuna/config.py
+++ b/tuna/config.py
@@ -1,5 +1,5 @@
import io, os, re, fnmatch
-import sys, gtk, pygtk
+import sys, pygtk
import codecs, ConfigParser
from time import localtime, strftime
from subprocess import Popen, PIPE, STDOUT, call
--
1.8.4.2
9 years, 12 months
[PATCH 1/2] CLI: fix traceback due unavailable display
by Petr Oros
Signed-off-by: Petr Oros <poros(a)redhat.com>
---
tuna/config.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tuna/config.py b/tuna/config.py
index e446447..77cc4d8 100644
--- a/tuna/config.py
+++ b/tuna/config.py
@@ -1,5 +1,5 @@
import io, os, re, fnmatch
-import sys, gtk, pygtk
+import sys, pygtk
import codecs, ConfigParser
from time import localtime, strftime
from subprocess import Popen, PIPE, STDOUT, call
--
1.8.4.2
9 years, 12 months