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

Commit

Permalink
Merge branch 'release/0.4.0-rc1'
Browse files Browse the repository at this point in the history
* release/0.4.0-rc1: (163 commits)
  bump version
  ignores
  expand pypi classifiers
  update api doc for split traceback and logging compat
  using readthedocs
  be consitent using explicit relative imports
  fix bug in fixed print_width option
  unwanted
  renaming xtraceback.tests to xtraceback.test
  excluding a jython test that fails on travis
  unwanted
  full support for python 3
  linted
  don't need rope in git
  latest makeenv
  correct subst call in jython SHELLOPTS
  latest makeenv
  latest makeenv
  travis has dropped py31 and added py33
  peg stacked version
  ...
  • Loading branch information
kingarrrt committed Oct 15, 2013
2 parents a2a1520 + 0e0bc80 commit 7d6f93a
Show file tree
Hide file tree
Showing 89 changed files with 11,432 additions and 1,662 deletions.
12 changes: 0 additions & 12 deletions .coveragerc

This file was deleted.

13 changes: 7 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
*.pyc
*.egg-info/
dist/
.coverage
reports/
*.swp
doc/.build/
*$py.class
/*.egg-info/
/.build/
/.coverage
/.dist/
/.lib/
/.venv/
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule ".makeenv"]
path = .makeenv
url = https://github.com/0compute/makeenv
1 change: 1 addition & 0 deletions .makeenv
Submodule .makeenv added at 01e0b8
247 changes: 0 additions & 247 deletions .pylintrc

This file was deleted.

15 changes: 15 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
language: python
env:
- PYTHON=python2.7
- PYTHON=python2.6
- PYTHON=python2.5
- PYTHON=python3.2
- PYTHON=python3.3
- VIRTUAL_ENV_NAME=nopygments
- VIRTUAL_ENV_NAME=nonose
- PYTHON=jython
before_install:
- export PIP_DOWNLOAD_CACHE=$(mktemp -d)
- if [[ $PYTHON == jython ]]; then JAR=http://downloads.sourceforge.net/project/jython/jython/2.5.2/jython_installer-2.5.2.jar; wget $JAR && java -jar $(basename $JAR) -sd ~/jython && export PATH=~/jython:$PATH; fi
install: make env
script: make coverage
10 changes: 10 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
0.4.0
=====

* Support for Python 2.5, 2.6, 2.7 and Jython 2.5


0.3.3 and before
================

See `git log`.
17 changes: 9 additions & 8 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@ Copyright (c) 2011 Arthur Noel
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
36 changes: 36 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
MAKEENV_MODULES = *
MAKEENV_ROOT ?= .makeenv
include $(MAKEENV_ROOT)/makeenv.mak

ENVIRONMENTS += nopygments nonose

ifdef FAST
# jython startup is not quick
# FIXME: see end of multienv makefile
SUPPORTED_PYTHONS := $(subst jython,,$(SUPPORTED_PYTHONS))
# fast excludes the below stdlib test because it has a 4 second sleep
TEST_COMMAND += --exclude=test_bug737473
endif

ifeq ($(PYTHON),jython)
# jython may be a shell script wrapper that uses unset variables
SHELLOPTS := $(subst :nounset,,$(SHELLOPTS))
# FIXME: this one fails on travis
TEST_COMMAND += --exclude=na_jython_test_members
endif

# the nonose test doesn't use nose (obviously?) so we override the test and
# coverage commands
ifeq ($(VIRTUAL_ENV_NAME),nonose)
TEST_COMMAND = xtraceback/tests/test_plugin_import.py
COVERAGE_COMMAND = $(COVERAGE_CLI) run $(TEST_COMMAND)
else
# xtraceback is added by makeeenv to the test command options but we don't
# want to use it for self
TEST_COMMAND := $(subst --with-xtraceback,,$(TEST_COMMAND))
endif

# this is used in setup.py to indicate that the nose entry point should not be
# installed - if it is installed for test it screws up coverage because the
# xtraceback module gets imported too early
export XTRACEBACK_NO_NOSE = 1
15 changes: 15 additions & 0 deletions Makefile.jenkins
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
include Makefile

# execute the coverage command then transform the latest .coverage file to
# relative paths - this is so that tests can be executed in different places
# with the coverage later combined
#
# FIXME: This is ugly and doesn't work in parallel

COVERAGE_TRANSFORM = $(PYTHON) xtraceback/tests/coverage_transform.py

$(COVERAGE)::
$(COVERAGE_TRANSFORM) rel $$(ls -t .coverage.* | head -1)

coverage-prereport::
$(COVERAGE_TRANSFORM) abs .coverage.*
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
XTraceback is a verbose Python traceback formatter with support for variable
expansion and syntax highlighting. It is intended both as a development tool
and as an aide to post-mortem debugging.

Documentation is published at http://xtraceback.readthedocs.org/.

[![Build Status](https://secure.travis-ci.org/0compute/xtraceback.png?branch=develop)](http://travis-ci.org/0compute/xtraceback)
Loading

0 comments on commit 7d6f93a

Please sign in to comment.