Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
* origin/master: (42 commits)
  refactor the main probe loop (uber-archive#108)
  be less aggressive about probing for libpython in attach mode (uber-archive#107)
  add version string to -h output
  Switch to PTRACE_TRACEME to fix startup race conditions. (uber-archive#106)
  tag v1.5.2
  fix a bug with venv deactivation in runtests.sh (uber-archive#105)
  augment version string (uber-archive#103)
  remove pointless build note (uber-archive#101)
  Switch to -p to specify the process to trace, fixes uber-archive#99 (uber-archive#100)
  explain how --abi works
  relase v1.5.1, which fixes uber-archive#93
  convert the man page to pandoc, fixes uber-archive#97
  Fix a bug in PtraceDetach when threads are enabled (uber-archive#94)
  detect when test suite is run from within a virtualenv (uber-archive#95)
  remove an unneeded skipif and yapf the tests
  tag 1.5.0 release
  use skipif here as well
  Unicode support (uber-archive#92)
  Various autoconf improvements.
  move all Python.h checks to configure.ac
  ...
  • Loading branch information
akatrevorjay committed Aug 4, 2017
2 parents c949b1b + 4c24456 commit 067896a
Show file tree
Hide file tree
Showing 36 changed files with 2,316 additions and 1,016 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ build-aux/
configure
config.h
stamp-h1
\.test_env/
6 changes: 5 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,23 @@ python:
- "2.7"
- "3.4"
- "3.5"
- "3.6"

addons:
apt:
sources:
# Needed only because the Travis VMs don't have python-3.6.pc
- sourceline: 'ppa:jonathonf/python-3.6'
packages:
- autotools-dev
- g++
- pkg-config
- python-dev
- python3-dev
- python3.6-dev

script:
- sudo sysctl kernel.yama.ptrace_scope=0
- unset PYTHON_CFLAGS
- ./autogen.sh
- ./configure
- make
Expand Down
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ SUBDIRS = src
EXTRA_DIST = autogen.sh LICENSE README.md
ACLOCAL_AMFLAGS = -I m4

man1_MANS = pyflame.man
man1_MANS = docs/pyflame.man

.PHONY: clean-local
clean-local:
Expand Down
Loading

0 comments on commit 067896a

Please sign in to comment.