From caeafb38a70bf01a6fe5de365c38c8dfff7c32f0 Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Sat, 19 Oct 2019 13:41:59 -0700 Subject: [PATCH 1/2] [#681] Update version handling in source and travis deployments --- .travis.yml | 4 ++-- Makefile | 4 ++-- pyproject.toml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 80c433fab..537f33022 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,10 +12,10 @@ before_deploy: - pip install poetry - poetry config http-basic.pypi $PYPI_USER $PYPI_PASS - poetry version $TRAVIS_TAG - - poetry build + - make build deploy: provider: script - script: poetry publish + script: make release skip_cleanup: true draft: true on: diff --git a/Makefile b/Makefile index de491e1f4..11e16826a 100644 --- a/Makefile +++ b/Makefile @@ -26,10 +26,10 @@ lint: ## check style with flake8 test: ## Run behave tests poetry run behave -dist: clean ## builds source and wheel package +build: poetry build -release: dist ## package and upload a release +release: poetry publish poetry run mkdocs gh-deploy diff --git a/pyproject.toml b/pyproject.toml index 7c2f123a4..1b84acde0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "jrnl" -version = "2.1" +version = "0.0.0-source" description = "Collect your thoughts and notes without leaving the command line." authors = [ "Manuel Ebert ", From 675ef51ca18e37771e927bbed36544b6e983ce78 Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Sat, 19 Oct 2019 13:50:52 -0700 Subject: [PATCH 2/2] [#681] Appease the poetry gods --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 537f33022..797fc87ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,8 @@ python: "3.7" before_install: - pip install poetry install: + # we run `poetry version` here to appease poetry about '0.0.0-source' + - poetry version - poetry install script: - poetry run python --version