Merge b547d14 into 68626b1

.appveyor.yml

@@ -21,7 +21,8 @@ install:
   - set PATH=C:\Python%PYTHON_MAJOR%%PYTHON_MINOR%;%PATH%
   - set PATH=C:\Python%PYTHON_MAJOR%%PYTHON_MINOR%\Scripts;%PATH%
   # Install system dependencies
-  - pip install pipenv
+  - curl -sSL https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py | python
+  - set PATH=%USERPROFILE%\.poetry\bin
   - make doctor
   # Install project dependencies
   - make install

.python-version

@@ -0,0 +1 @@
+3.7.0

.travis.yml

@@ -12,14 +12,15 @@ matrix:
 cache:
   pip: true
   directories:
-    - .venv
+    - ${VIRTUAL_ENV}
 
 env:
   global:
     - RANDOM_SEED=0
 
 before_install:
-  - pip install pipenv
+  - curl -sSL https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py | python
+  - source $HOME/.poetry/env
   - make doctor
 
 install:

.verchew.ini

@@ -8,10 +8,10 @@ version = GNU Make
 cli = python
 versions = Python 3.4. | Python 3.5. | Python 3.6
 
-[pipenv]
+[Poetry]
 
-cli = pipenv
-versions = 10. | 11.
+cli = poetry
+version = 0.12.
 
 [Graphviz]
 

CONTRIBUTING.md

@@ -8,7 +8,7 @@
     * Windows: http://mingw.org/download/installer
     * Mac: http://developer.apple.com/xcode
     * Linux: http://www.gnu.org/software/make
-* pipenv: http://docs.pipenv.org
+* Poetry: https://poetry.eustace.io
 * Graphviz: http://www.graphviz.org/Download.php
 
 To confirm these system dependencies are configured correctly:

Makefile

@@ -9,13 +9,11 @@ CONFIG := $(wildcard *.py)
 MODULES := $(wildcard $(PACKAGE)/*.py)
 
 # Virtual environment paths
-export PIPENV_VENV_IN_PROJECT=true
-export PIPENV_IGNORE_VIRTUALENVS=true
-VENV := .venv
+VIRTUAL_ENV ?= .venv
 
 # MAIN TASKS ##################################################################
 
-SNIFFER := pipenv run sniffer
+SNIFFER := poetry run sniffer
 
 .PHONY: all
 all: install
@@ -29,7 +27,7 @@ watch: install .clean-test ## Continuously run all CI tasks when files chanage
 
 .PHONY: run ## Start the program
 run: install
-	pipenv run python $(PACKAGE)/__main__.py
+	poetry run python $(PACKAGE)/__main__.py
 
 # SYSTEM DEPENDENCIES #########################################################
 
@@ -39,24 +37,29 @@ doctor:  ## Confirm system dependencies are available
 
 # PROJECT DEPENDENCIES ########################################################
 
-DEPENDENCIES := $(VENV)/.pipenv-$(shell bin/checksum Pipfile* setup.py)
+DEPENDENCIES := $(VIRTUAL_ENV)/.poetry-$(shell bin/checksum pyproject.toml poetry.lock) *.egg-info
 
 .PHONY: install
 install: $(DEPENDENCIES)
 
 $(DEPENDENCIES):
-	pipenv run python setup.py develop
-	pipenv install --dev
+	@ poetry config settings.virtualenvs.in-project true
+	poetry install
 	@ touch $@
 
 # CHECKS ######################################################################
 
-PYLINT := pipenv run pylint
-PYCODESTYLE := pipenv run pycodestyle
-PYDOCSTYLE := pipenv run pydocstyle
+ISORT := poetry run isort
+PYLINT := poetry run pylint
+PYCODESTYLE := poetry run pycodestyle
+PYDOCSTYLE := poetry run pydocstyle
 
 .PHONY: check
-check: pylint pycodestyle pydocstyle ## Run linters and static analysis
+check: isort pylint pycodestyle pydocstyle ## Run linters and static analysis
+
+.PHONY: isort
+isort: install
+	$(ISORT) $(PACKAGES) $(CONFIG) --recursive --apply
 
 .PHONY: pylint
 pylint: install
@@ -72,9 +75,9 @@ pydocstyle: install
 
 # TESTS #######################################################################
 
-PYTEST := pipenv run pytest
-COVERAGE := pipenv run coverage
-COVERAGE_SPACE := pipenv run coverage.space
+PYTEST := poetry run pytest
+COVERAGE := poetry run coverage
+COVERAGE_SPACE := poetry run coveragespace
 
 RANDOM_SEED ?= $(shell date +%s)
 FAILURES := .cache/v/cache/lastfailed
@@ -115,8 +118,8 @@ read-coverage:
 
 # DOCUMENTATION ###############################################################
 
-PYREVERSE := pipenv run pyreverse
-MKDOCS := pipenv run mkdocs
+PYREVERSE := poetry run pyreverse
+MKDOCS := poetry run mkdocs
 
 MKDOCS_INDEX := site/index.html
 
@@ -146,18 +149,16 @@ mkdocs-live: mkdocs
 
 # BUILD #######################################################################
 
-PYINSTALLER := pipenv run pyinstaller
-PYINSTALLER_MAKESPEC := pipenv run pyi-makespec
+PYINSTALLER := poetry run pyinstaller
+PYINSTALLER_MAKESPEC := poetry run pyi-makespec
 
 DIST_FILES := dist/*.tar.gz dist/*.whl
 EXE_FILES := dist/$(PROJECT).*
 .PHONY: dist
 dist: install $(DIST_FILES)
 $(DIST_FILES): $(MODULES)
 	rm -f $(DIST_FILES)
-	pipenv run python setup.py check --strict --metadata
-	pipenv run python setup.py sdist
-	pipenv run python setup.py bdist_wheel
+	poetry build
 
 .PHONY: exe
 exe: install $(EXE_FILES)
@@ -170,12 +171,10 @@ $(PROJECT).spec:
 
 # RELEASE #####################################################################
 
-TWINE := pipenv run twine
-
 .PHONY: upload
 upload: dist ## Upload the current version to PyPI
 	git diff --name-only --exit-code
-	$(TWINE) upload dist/*.*
+	poetry publish
 	bin/open https://pypi.org/project/$(PROJECT)
 
 # CLEANUP #####################################################################
@@ -185,7 +184,7 @@ clean: .clean-build .clean-docs .clean-test .clean-install ## Delete all generat
 
 .PHONY: clean-all
 clean-all: clean
-	rm -rf $(VENV)
+	rm -rf $(VIRTUAL_ENV)
 
 .PHONY: .clean-install
 .clean-install: