Merge pull request #34 from chaimleib/dev2.x

Merge Dev2.x (v3.0.0)

Author: chaimleib

.gitignore

@@ -6,6 +6,7 @@
 *.pyc
 dist/
 build/
+.cache/
 
 # generated by coverage
 .coverage

.travis.yml

@@ -1,10 +1,9 @@
 language: python
 python:
-    - "2.6"
     - "2.7"
-    - "3.2"
-    - "3.3"
     - "3.4"
+    - "3.5"
+    - "3.6"
 install:
     - make deps-dev
     - pip install coverage

CHANGELOG.md

@@ -1,9 +1,23 @@
-Change log
-==========
+# Change log
+
+## Version 3.0.0
+- Dropped support for Python 2.6, 3.2, and 3.3
+- Add support for Python 3.5 and 3.6
+- Updated README:
+    - new restructuring methods from 2.1.0
+    - example of `from_tuples()` added
+    - more info about `chop()`, `split_overlaps()`, `merge_overlaps()` and `merge_equals()`.
+- Fixes:
+    - `Node.from_tuples()` will now raise an error if given an empty iterable. This should never happen, and it should error if it does.
+    - `Interval.distance_to()` gave an incorrect distance when passed the `Interval`'s upper boundary
+- Maintainers:
+    - use github.com/kennethreitz/pyandoc
+    - reorganize tests
+    - more tests added to improve code coverage (We're at 95%! Woohoo!)
+    - test for issue #4 had a broken import reference
 
-Version 2.1.0
--------------
-- Added: 
+## Version 2.1.0
+- Added:
     - `merge_overlaps()` method and tests
     - `merge_equals()` method and tests
     - `range()` method
@@ -16,25 +30,20 @@ Version 2.1.0
     - Added coverage test (`make coverage`) with html report (`htmlcov/index.html`)
     - Tests run slightly faster
 
-Version 2.0.4
--------------
+## Version 2.0.4
 - Fix: Issue #27: README incorrectly showed using a comma instead of a colon when querying the `IntervalTree`: it showed `tree[begin, end]` instead of `tree[begin:end]`
 
-Version 2.0.3
--------------
+## Version 2.0.3
 - Fix: README showed using + operator for setlike union instead of the correct | operator
 - Removed tests from release package to speed up installation; to get the tests, download from GitHub
 
-Version 2.0.2
--------------
+## Version 2.0.2
 - Fix: Issue #20: performance enhancement for large trees. `IntervalTree.search()` made a copy of the entire `boundary_table` resulting in linear search time. The `sortedcollections` package is now the sole install dependency
 
-Version 2.0.1
--------------
+## Version 2.0.1
 - Fix: Issue #26: failed to prune empty `Node` after a rotation promoted contents of `s_center`
 
-Version 2.0.0
--------------
+## Version 2.0.0
 - `IntervalTree` now supports the full `collections.MutableSet` API
 - Added:
     - `__delitem__` to `IntervalTree`
@@ -62,12 +71,10 @@ Version 2.0.0
     - `IntervalTree.overlaps()` and friends returned `None` instead of `False`
     - Maintainers: `make install-testpypi` failed because the `pip` was missing a `--pre` flag
 
-Version 1.1.1
--------------
+## Version 1.1.1
 - Removed requirement for pyandoc in order to run functionality tests.
 
-Version 1.1.0
--------------
+## Version 1.1.0
 - Added ability to use `Interval.distance_to()` with points, not just `Intervals`
 - Added documentation on return types to `IntervalTree` and `Interval`
 - `Interval.__cmp__()` works with points too
@@ -77,18 +84,15 @@ Version 1.1.0
     - Optimality tests added
     - `Interval` overlap tests for ranges, `Interval`s and points added
 
-Version 1.0.2
--------------
+## Version 1.0.2
 -Bug fixes:
     - `Node.depth_score_helper()` raised `AttributeError`
     - README formatting
 
-Version 1.0.1
--------------
+## Version 1.0.1
 - Fix: pip install failure because of failure to generate README.rst
 
-Version 1.0.0
--------------
+## Version 1.0.0
 - Renamed from PyIntervalTree to intervaltree
 - Speed improvements for adding and removing Intervals (~70% faster than 0.4)
 - Bug fixes:
@@ -99,23 +103,17 @@ Version 1.0.0
     - More robust local testing tools
     - Long series of interdependent tests have been separated into sections
 
-Version 0.4
--------------
-
+## Version 0.4
 - Faster balancing (~80% faster)
 - Bug fixes:
     - Double rotations were performed in place of a single rotation when presented an unbalanced Node with a balanced child.
     - During single rotation, kept referencing an unrotated Node instead of the new, rotated one
 
-Version 0.3.3
--------------
-
+## Version 0.3.3
 - Made IntervalTree crash if inited with a null Interval (end <= begin)
 - IntervalTree raises ValueError instead of AssertionError when a null Interval is inserted
 
-Version 0.3.2
--------------
-
+## Version 0.3.2
 - Support for Python 3.2+ and 2.6+
 - Changed license from LGPL to more permissive Apache license
 - Merged changes from https://github.com/konstantint/PyIntervalTree to
@@ -144,16 +142,12 @@ Version 0.3.2
     - Local script to test in all supported versions of Python
     - Added IntervalTree.score() to measure how optimally a tree is structured
 
-Version 0.2.3
--------------
-
+## Version 0.2.3
 - Slight changes for inclusion in PyPI.
 - Some documentation changes
 - Added tests
 - Bug fix: interval addition via [] was broken in Python 2.7 (see http://bugs.python.org/issue21785)
 - Added intervaltree.bio subpackage, adding some utilities for use in bioinformatics
 
-Version 0.2.2b
---------------
-
+## Version 0.2.2b
 - Forked from https://github.com/MusashiAharon/PyIntervalTree

HACKING.md

@@ -9,7 +9,7 @@ This is a developer's guide to modifying and maintaining `intervaltree`.
 
 * On Linux, you will need `apt-get`.
 
-On all systems, Python 2.6, 2.7, 3.2, 3.3 and 3.4 are needed to run the complete test suite. 
+On all systems, Python 2.6, 2.7, 3.2, 3.3, 3.4 and 3.5 are needed to run the complete test suite. 
 
 ### Single version of Python
 
@@ -87,7 +87,7 @@ The two commands above run all the available tests on all versions of Python sup
 
 The first time you run `make`, you may be asked for your password. This is in order to install `pandoc`, a tool used for processing the README file.
 
-Running all tests requires that you have all the supported versions of Python installed. These are 2.6, 2.7, 3.2, 3.3, and 3.4. Try to use your packaga manager to install them if possible. Otherwise, go to [python.org/downloads][] and install them manually.
+Running all tests requires that you have all the supported versions of Python installed. These are 2.6, 2.7, 3.2, 3.3, 3.4 and 3.5. Try to use your package manager to install them if possible. Otherwise, go to [python.org/downloads][] and install them manually.
 
 #### Single version of Python
 
@@ -125,7 +125,7 @@ To update the README on PyPI, run
 
     make register
 
-This will test the README's syntax stricly and push it up to the PyPI test server.
+This will test the README's syntax strictly and push it up to the PyPI test server.
 
 If you are satisfied with the results, run
 

MANIFEST.in

@@ -1 +1 @@
-include README.md CHANGELOG.md LICENSE.txt
+include README.md CHANGELOG.md LICENSE.txt

Makefile

@@ -4,17 +4,22 @@ SCRIPTS_DIR:=$(PWD)/scripts
 
 # any files ending in .py?, and any folders named __pycache__
 TEMPS=$(shell                                                   \
-	find intervaltree/ test/                                    \
+	find intervaltree test                                    \
 		\( -type f -name '*.py?' ! -path '*/__pycache__/*' \)   \
 		-o \( -type d -name '__pycache__' \)                    \
 )
 
-PYTHONS:=2.6 2.7 3.2 3.3 3.4
-PYTHON_MAJORS:=$(shell          \
+PYTHONS:=2.7.14 3.4.3 3.5.4 3.6.3
+PYTHON_MAJORS:=$(shell        \
 	echo "$(PYTHONS)" |         \
 	tr ' ' '\n' | cut -d. -f1 | \
 	uniq                        \
 )
+PYTHON_MINORS:=$(shell          \
+	echo "$(PYTHONS)" |           \
+	tr ' ' '\n' | cut -d. -f1,2 | \
+	uniq                          \
+)
 
 # PyPI server name, as specified in ~/.pypirc
 # See http://peterdowns.com/posts/first-time-with-pypi.html
@@ -34,7 +39,7 @@ coverage:
 	coverage html
 
 pytest: deps-dev
-	"$(SCRIPTS_DIR)/testall.sh"
+	PYTHONS="$(PYTHONS)" PYTHON_MINORS="$(PYTHON_MINORS)" "$(SCRIPTS_DIR)/testall.sh"
 
 clean: clean-build clean-eggs clean-temps
 
@@ -82,10 +87,12 @@ release:
 sdist-upload:
 	PYPI=$(PYPI) python setup.py sdist upload -r $(PYPI)
 
-deps-dev: pyandoc
+deps-ci: pyandoc
+
+deps-dev: pyandoc pyenv-install-versions
 
 pyandoc: pandoc-bin
-	[[ -d pyandoc/pandoc ]] || git clone --depth=50 git://github.com/chaimleib/pyandoc.git
+	[[ -d pyandoc/pandoc ]] || git clone --depth=50 git://github.com/kennethreitz/pyandoc.git
 	[[ "`readlink pandoc`" == "pyandoc/pandoc" ]] || ln -s pyandoc/pandoc pandoc
 
 pandoc-bin: pm-update
@@ -103,13 +110,21 @@ pm-update:
 # Uploads to test server, unless the release target was run too
 upload: test clean sdist-upload
 
+pyenv-is-installed:
+	pyenv --version || (echo "ERROR: pyenv not installed" && false)
+
+pyenv-install-versions: pyenv-is-installed
+	for pyver in $(PYTHONS); do (echo N | pyenv install $$pyver) || true; done
+	for pyver in $(PYTHONS); do export PYENV_VERSION=$$pyver; pip install -U pip; pip install -U pytest; done
+	pyenv rehash
 
 # for debugging the Makefile
 env:
 	@echo
 	@echo TEMPS="\"$(TEMPS)\""
 	@echo PYTHONS="\"$(PYTHONS)\""
 	@echo PYTHON_MAJORS="\"$(PYTHON_MAJORS)\""
+	@echo PYTHON_MINORS="\"$(PYTHON_MINORS)\""
 	@echo PYPI="\"$(PYPI)\""
 
 
@@ -126,11 +141,14 @@ env:
 	install-testpypi \
 	install-pypi \
 	install-develop \
+	pyenv-install-versions \
+	pyenv-is-installed \
 	uninstall \
 	rst \
 	register \
 	release \
 	sdist-upload \
+	deps-ci \
 	deps-dev \
 	pyandoc \
 	pandoc-bin \