summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2017-08-08 22:12:12 +0300
committerLars Wirzenius <liw@liw.fi>2017-08-08 22:12:12 +0300
commita4dae9c5ebdf2962a8476ad536c9245a7acb4517 (patch)
tree91a0c23efc52b50a55a75679839bee29bdffd518
parent2446d1b99cc7b0c4e8ae56fdbfa850fc56069eda (diff)
downloadcliapp-a4dae9c5ebdf2962a8476ad536c9245a7acb4517.tar.gz
Drop: meliae support
It's not been too useful and it's not got a Python 3 version.
-rw-r--r--NEWS1
-rw-r--r--cliapp/settings.py4
-rw-r--r--cliapp/util.py7
-rw-r--r--debian/changelog1
-rw-r--r--debian/control2
5 files changed, 5 insertions, 10 deletions
diff --git a/NEWS b/NEWS
index d7cfef3..faccaba 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ Version 1.20160724+git, not yet released
* `cliapp.runcmd` now has a optional arguments `output_timeout` and
`timeout_callback`.
+* Meliae the Python memory profiler is no longer supported.
Version 1.20160724, released 2016-07-24
----------------------------------------
diff --git a/cliapp/settings.py b/cliapp/settings.py
index 7bc0ec4..8d58a31 100644
--- a/cliapp/settings.py
+++ b/cliapp/settings.py
@@ -349,9 +349,9 @@ class Settings(object):
metavar='MODE', default='0600', group=log_group_name)
self.choice(['dump-memory-profile'],
- ['simple', 'none', 'meliae'],
+ ['simple', 'none'],
'make memory profiling dumps using METHOD, which is one '
- 'of: none, simple, or meliae '
+ 'of: none, or simple (no meliae support anymore)'
'(default: %default)',
metavar='METHOD',
group=perf_group_name)
diff --git a/cliapp/util.py b/cliapp/util.py
index eefbfa7..81e6492 100644
--- a/cliapp/util.py
+++ b/cliapp/util.py
@@ -72,13 +72,6 @@ class MemoryProfileDumper(object):
logging.debug('# objects: %d', len(gc.get_objects()))
logging.debug('# garbage: %d', len(gc.garbage))
- if kind == 'meliae':
- filename = 'obnam-%d.meliae' % self.memory_dump_counter
- logging.debug('memory profile: see %s', filename)
- from meliae import scanner
- scanner.dump_all_objects(filename)
- self.memory_dump_counter += 1
-
def _vmrss(self): # pragma: no cover
'''Return current resident memory use, in KiB.'''
if platform.system() != 'Linux':
diff --git a/debian/changelog b/debian/changelog
index d47fdfc..a271124 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ python-cliapp (1.20160724+git-1) UNRELEASED; urgency=medium
* New upstream version.
* Require Python 2.7.
* Bump Standards-Version to 3.9.8. No changes required.
+ * Drop build-dep on python-meliae.
-- Lars Wirzenius <liw@liw.fi> Sun, 24 Jul 2016 21:50:41 +0300
diff --git a/debian/control b/debian/control
index d8e3417..98bb08b 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Priority: optional
Standards-Version: 3.9.8
Build-Depends: debhelper (>= 9), python-all (>= 2.7~),
python-coverage-test-runner, python-sphinx, pep8, pylint,
- python-yaml, python-meliae, python-xdg
+ python-yaml, python-xdg
X-Python-Version: >= 2.7
Package: python-cliapp