Skip to content
This repository has been archived by the owner on Apr 9, 2024. It is now read-only.

Merge develop to master for a new pypi release 1.0.2 #172

Open
wants to merge 40 commits into
base: master
Choose a base branch
from

Conversation

abenassi
Copy link

I've seen that develop branch is behind master but merging the seems to be ok. I've added a previous PR in develop fixing and documenting decorators but now merging them to master because I would like to release the fix to a new pypi version.

Could it be possible to release this under 1.0.2 version to pypi?

Thanks and looking forward your comments.

gak and others added 30 commits September 17, 2013 20:23
(it gets imported by the examples/graphviz/grouper.py example later)
With the current MANIFEST.in the scripts for generating examples and
documentation are not actually included in the sdist.  This ensures the
documentation and example sources are included.
Ensure all files in docs are part of the sdist.
Setting graphivz output format is broken: -f / --output-format is ignored. This is because self.output_format is adjusted internally, not output_type. The fix is to set "dest" property of the corresponding argument.
Fix graphviz output format setting
Fix .format() to work with older Python versions
Removed "json" output mode from the docs, because it looks like json output is not implemented yet
Make Readme badges uniform and SVG using shields.io
set all "trace" decorator parameters to None by default
moved "trace" decorator tests from test_pycallgraph.py to test_decorators.py
add setup.cfg config to wheel package support
rgom and others added 10 commits June 12, 2015 08:53
Fix for gak#85.

When using the following pycallgraph invocation:
python c:\Python27\Scripts\pycallgraph graphviz -l
  "c:\Program Files (x86)\Graphviz2.36\bin\dot.exe" --
  scapy_start_profile.py

the tool could not be found. After the fix it's ok to use such paths.
Update readme with a typo correction.
Use subprocess instead of os.system()
`--use-mirrors` was removed as a `pip` option (pypa/pip#1098)
* develop: (27 commits)
  Fix decorator implementation and import. Document use of decorators in README.
  Update .travis.yaml
  Proper way of running system calls http://stackoverflow.com/a/3791476/1497443
  Update readme with a typo correction.
  [Bugfix] Allow spaces in tool path
  fix .travis.yml
  fix .travis.yml
  test with python 3.5-dev nightly builds and pypy
  renamed decorator from "pycall_profile" to "trace" set all "trace" decorator parameters to None by default moved "trace" decorator tests from test_pycallgraph.py to test_decorators.py add setup.cfg config to wheel package support
  pep8
  pep8 and add newline
  decorators from @ivannotes
  Make Readme badges uniform and SVG using shields.io
  Fix graphviz output format setting
  Removed "json" output mode from the docs, because it looks like json output is not implemented yet.
  more format fixes
  Make .format() work with older Python versions
  Ensure all files in docs are part of the sdist.
  remove unused import (was copy and pasted from filter example)
  add main to __all__ so that flake8 won't complain about unused import
  ...

# Conflicts:
#	README.rst
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.