merge of intervaltree 3.0.2 with own changes

Author: Oliver Lammas

.gitignore

@@ -1,12 +1,14 @@
 # IDE dirs
 .idea/
 *.komodoproject
+.vscode/
 
 # Auto-generated
 *.pyc
 dist/
 build/
 .cache/
+.pytest_cache/
 
 # pyenv
 .python-version

.travis.yml

@@ -1,13 +1,23 @@
 language: python
-python:
-    - "2.7"
-    - "3.4"
-    - "3.5"
-    - "3.6"
+matrix:
+  include:
+    - python: 2.7
+    - python: 3.4
+    - python: 3.5
+    - python: 3.6
+    - python: 3.7
+      dist: xenial
+      sudo: true
+    - python: 3.8-dev
+      env: FAILOK=y
+      dist: xenial
+      sudo: true
+  allow_failures:
+    - env: FAILOK=y
 install:
-    - make deps-dev
-    - pip install coverage
+  - make deps-dev
+  - pip install coverage
 script:
-    coverage run --source=intervaltree setup.py develop test
+  coverage run --source=intervaltree setup.py develop test
 after_success:
-    coverage report
+  coverage report

CHANGELOG.md

@@ -1,18 +1,34 @@
 # Change log
 
-## Version 3.1.0
-###fixed
-- import of mutable sets for python 3.8
+## Version 4.0.0 (kindjacket edit)
 
-###added
+### added
 - `chop_intervals_that_envelope_range()` method and tests 
 - `search_for_period_that_envelopes_range()` method and tests
 - `search_point_inclusive` method
 - pyproject.toml for poetry build
 
+## Version 3.0.2
+- Fixed:
+    - On some systems, setup.py opened README.md with a non-unicode encoding. My fault for leaving the encoding flapping in the breeze. It's been fixed.
+
+## Version 3.0.1
+- Added:
+    - Travis testing for 3.7 and 3.8-dev. These needed OpenSSL, sudo and Xenial. 3.8-dev is allowed to fail.
+- Fixed:
+    - PyPI wasn't rendering markdown because I didn't tell it what format to use.
+    - Python 2 wasn't installing via pip because of a new utils package. It has been zapped.
+- Maintainers:
+    - TestPyPI version strings use `.postN` as the suffix instead of `bN`, and `N` counts from the latest tagged commit, which should be the last release
+    - Install from TestPyPI works via `make install-testpypi`
+
 ## Version 3.0.0
-- Dropped support for Python 2.6, 3.2, and 3.3
-- Add support for Python 3.5 and 3.6
+- Breaking:
+    - `search(begin, end, strict)` has been replaced with `at(point)`, `overlap(begin, end)`, and `envelop(begin, end)`
+    - `extend(items)` has been deleted, use `update(items)` instead
+    - Methods that take a `strict=True/False` argument now consistently default to `strict=True`
+    - Dropped support for Python 2.6, 3.2, and 3.3
+    - Add support for Python 3.5, 3.6, and 3.7
 - Faster `Interval` overlap checking (@tuxzz, #56)
 - Updated README:
     - new restructuring methods from 2.1.0
@@ -23,10 +39,12 @@
     - `Interval.distance_to()` gave an incorrect distance when passed the `Interval`'s upper boundary
     - `Node.pop_greatest_child()` sometimes forgot to `rotate()` when creating new child nodes. (@escalonn, #41, #42)
     - `IntervalTree.begin()` and `end()` are O(1), not O(n). (@ProgVal, #40)
+    - `intersection_update()` and `symmetric_difference()` and `symmetric_difference_update()` didn't actually work. Now they do.
+    - `collections.abc` deprecation warning no longer happens
 - Maintainers:
-    - use github.com/kennethreitz/pyandoc
+    - PyPi accepts Markdown! Woohoo!
     - reorganize tests
-    - more tests added to improve code coverage (We're at 95%! Woohoo!)
+    - more tests added to improve code coverage (We're at 96%! Yay!)
     - test for issue #4 had a broken import reference
 
 ## Version 2.1.0

Makefile

@@ -9,7 +9,7 @@ TEMPS=$(shell                                                   \
 		-o \( -type d -name '__pycache__' \)                    \
 )
 
-PYTHONS:=2.7.14 3.4.3 3.5.4 3.6.3
+PYTHONS:=2.7.15 3.4.9 3.5.6 3.6.7 3.7.1
 PYTHON_MAJORS:=$(shell        \
 	echo "$(PYTHONS)" |         \
 	tr ' ' '\n' | cut -d. -f1 | \
@@ -25,12 +25,22 @@ PYTHON_MINORS:=$(shell          \
 # See http://peterdowns.com/posts/first-time-with-pypi.html
 PYPI=pypitest
 
+TWINE=$(shell                                         \
+	if twine --version &>/dev/null; then                \
+		echo twine                                       ;\
+	elif [[ -x ~/Library/Python/3.7/bin/twine ]]; then  \
+		echo '~/Library/Python/3.7/bin/twine'            ;\
+	else                                                \
+		echo twine                                       ;\
+	fi                                                  \
+)
+
 # default target
 all: test
 
-test: pytest rst
+test: pytest
 
-quicktest: rst
+quicktest:
 	PYPI=$(PYPI) python setup.py test
 
 coverage:
@@ -43,23 +53,23 @@ pytest: deps-dev
 
 clean: clean-build clean-eggs clean-temps
 
-distclean: clean clean-deps
+distclean: clean
 
 clean-build:
 	rm -rf dist build
 
 clean-eggs:
 	rm -rf *.egg* .eggs/
 
-clean-deps:
-	rm -rf pyandoc docutils bin
-	rm -f pandoc
-
 clean-temps:
 	rm -rf $(TEMPS)
 
 install-testpypi:
-	pip install --pre -i https://testpypi.python.org/pypi intervaltree
+	pip install \
+		--no-cache-dir \
+		--index-url https://test.pypi.org/simple/ \
+		--extra-index-url https://pypi.org/simple \
+		intervaltree
 
 install-pypi:
 	pip install intervaltree
@@ -70,52 +80,39 @@ install-develop:
 uninstall:
 	pip uninstall intervaltree
 
-# Convert README to rst and check the result
-rst: pydocutils pyandoc
-	PYPI=$(PYPI) python setup.py check --restructuredtext
-	@echo "README is ready for PyPI"
-
 # Register at PyPI
-register: rst
+register:
 	PYPI=$(PYPI) python setup.py register -r $(PYPI)
 
 # Setup for live upload
 release:
 	$(eval PYPI=pypi)
 
 # Build source distribution
-sdist-upload:
-	PYPI=$(PYPI) python setup.py sdist upload -r $(PYPI)
-
-deps-ci: pyandoc
+sdist-upload: distclean deps-dev
+	PYPI=$(PYPI) python setup.py sdist
+	if [[ "$(PYPI)" == pypitest ]]; then \
+		$(TWINE) upload --repository-url https://test.pypi.org/legacy/ dist/*; \
+	else \
+		$(TWINE) upload dist/*; \
+	fi
 
-deps-dev: pyandoc pyenv-install-versions
+deps-dev: pyenv-install-versions
 
-pyandoc: pandoc-bin
-	[[ -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
-	pandoc -h &>/dev/null || brew install pandoc &>/dev/null || sudo apt-get install pandoc
-	
-pydocutils:
-	$(eval PYPKG=docutils)
-	python -c 'import $(PYPKG)' &>/dev/null ||       \
-		pip install --upgrade $(PYPKG) ||            \
-		pip install --upgrade --install-options="--install-purelib='$(PWD)'" docutils
-	
-pm-update:
-	pandoc -h &>/dev/null || brew update &>/dev/null || sudo apt-get 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 --version &>/dev/null || (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
+	for pyver in $(PYTHONS); do \
+		export PYENV_VERSION=$$pyver; \
+		pip install -U pip; \
+		pip install -U pytest; \
+		pip install -U twine; \
+	done | grep -v 'Requirement already satisfied, skipping upgrade'
 	pyenv rehash
 
 # for debugging the Makefile
@@ -136,23 +133,18 @@ env:
 	distclean \
 	clean-build \
 	clean-eggs \
-	clean-deps \
 	clean-temps \
 	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 \
-	pydocutils \
 	pm-update \
 	upload \
 	env