Skip to content

Commit bdf9995

Browse files
committed
merge with upstream
2 parents e32679b + bed17ea commit bdf9995

6 files changed

Lines changed: 307 additions & 122 deletions

File tree

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
include README.rst
2+
include COPYING

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ test:
1111
$(PYTHON) -m memory_profiler test/test_precision_command_line.py
1212
$(PYTHON) -m memory_profiler test/test_gen.py
1313
$(PYTHON) -m memory_profiler test/test_unicode.py
14+
$(PYTHON) test/test_tracemalloc.py
1415
$(PYTHON) test/test_import.py
1516
$(PYTHON) test/test_memory_usage.py
1617
$(PYTHON) test/test_precision_import.py
1718
$(IPYTHON) test/test_ipython.py
19+

README.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,7 @@ cleanup.
410410

411411
`Sagar UDAY KUMAR <https://github.com/sagaru>`_ added Report generation feature and examples.
412412

413+
`Dmitriy Novozhilov <https://github.com/demiurg906>`_ and `Sergei Lebedev <https://github.com/superbobry>`_ added support for `tracemalloc <https://docs.python.org/3/library/tracemalloc.html>`_.
413414

414415
=========
415416
License

0 commit comments

Comments
 (0)