Skip to content

Commit

Permalink
Merge 6f57224 into 0a5ec49
Browse files Browse the repository at this point in the history
  • Loading branch information
jacebrowning committed Jul 6, 2018
2 parents 0a5ec49 + 6f57224 commit a7aba4e
Show file tree
Hide file tree
Showing 12 changed files with 950 additions and 829 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Expand Up @@ -21,7 +21,7 @@ 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
- pip install poetry
- make doctor
# Install project dependencies
- make install
Expand Down
1 change: 1 addition & 0 deletions .python-version
@@ -0,0 +1 @@
2.7.13
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -15,7 +15,7 @@ env:
- RANDOM_SEED=0

before_install:
- pip install pipenv
- pip install poetry
- make doctor

install:
Expand Down
6 changes: 3 additions & 3 deletions .verchew.ini
Expand Up @@ -8,10 +8,10 @@ version = GNU Make
cli = python
version = Python 2.7.

[pipenv]
[Poetry]

cli = pipenv
versions = 10. | 11.
cli = poetry
versions = 0.11.2

[pandoc]

Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,8 @@
# Revision History

## 1.0.1 (unreleased)

- Broadened dependency on `six` to `1.x`.
## 1.0.1 (2018/05/15)

- Broadened dependency on `six` to accept any version.
Expand Down
47 changes: 22 additions & 25 deletions Makefile
Expand Up @@ -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

# MAIN TASKS ##################################################################

SNIFFER := pipenv run sniffer
SNIFFER := poetry run sniffer

.PHONY: all
all: install
Expand All @@ -27,10 +25,6 @@ ci: check test ## Run all tasks that determine CI status
watch: install .clean-test ## Continuously run all CI tasks when files chanage
$(SNIFFER)

.PHONY: run ## Start the program
run: install
pipenv run python $(PACKAGE)/__main__.py

# SYSTEM DEPENDENCIES #########################################################

.PHONY: doctor
Expand All @@ -39,21 +33,24 @@ doctor: ## Confirm system dependencies are available

# PROJECT DEPENDENCIES ########################################################

DEPENDENCIES := $(VENV)/.pipenv-$(shell bin/checksum Pipfile* setup.py)
DEPENDENCIES := $(VENV)/.poetry-$(shell bin/checksum pyproject.*)

.PHONY: install
install: $(DEPENDENCIES)

$(DEPENDENCIES):
pipenv run python setup.py develop
pipenv install --dev
$(DEPENDENCIES): pyproject.lock
@ poetry config settings.virtualenvs.in-project true
poetry develop
@ touch $@

pyproject.lock: pyproject.toml
poetry lock

# CHECKS ######################################################################

PYLINT := pipenv run pylint
PYCODESTYLE := pipenv run pycodestyle
PYDOCSTYLE := pipenv run pydocstyle
PYLINT := poetry run pylint
PYCODESTYLE := poetry run pycodestyle
PYDOCSTYLE := poetry run pydocstyle

.PHONY: check
check: pylint pycodestyle pydocstyle ## Run linters and static analysis
Expand All @@ -72,9 +69,9 @@ pydocstyle: install

# TESTS #######################################################################

PYTEST := pipenv run py.test
COVERAGE := pipenv run coverage
COVERAGE_SPACE := pipenv run coverage.space
PYTEST := poetry run py.test
COVERAGE := poetry run coverage
COVERAGE_SPACE := poetry run coverage.space

RANDOM_SEED ?= $(shell date +%s)
FAILURES := .cache/v/cache/lastfailed
Expand Down Expand Up @@ -120,8 +117,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

Expand Down Expand Up @@ -151,8 +148,8 @@ 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).*
Expand All @@ -164,9 +161,9 @@ build: dist
dist: install $(DIST_FILES)
$(DIST_FILES): $(MODULES) README.rst CHANGELOG.rst
rm -f $(DIST_FILES)
pipenv run python setup.py check --restructuredtext --strict --metadata
pipenv run python setup.py sdist
pipenv run python setup.py bdist_wheel
poetry run python setup.py check --restructuredtext --strict --metadata
poetry run python setup.py sdist
poetry run python setup.py bdist_wheel

%.rst: %.md
pandoc -f markdown_github -t rst -o $@ $<
Expand All @@ -182,7 +179,7 @@ $(PROJECT).spec:

# RELEASE #####################################################################

TWINE := pipenv run twine
TWINE := poetry run twine

.PHONY: upload
upload: dist ## Upload the current version to PyPI
Expand Down
46 changes: 0 additions & 46 deletions Pipfile

This file was deleted.

0 comments on commit a7aba4e

Please sign in to comment.