From f7953fdd6191d085ed5157d89efcdf6218904ebe Mon Sep 17 00:00:00 2001
From: Jonathan Wren <jonathan@nowandwren.com>
Date: Sat, 19 Oct 2019 13:03:57 -0700
Subject: [PATCH] =?UTF-8?q?=C2=AF\=5F(=E3=83=84)=5F/=C2=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[#681] Update version handling in source and travis deployments
[#681] Appease the poetry gods
[#681] Separate local dev from pipeline releases
[#681] take out automated pages deployment (for now), since it broke the
site
---
 .travis.yml    | 19 +++++++++++--------
 Makefile       | 10 +---------
 pyproject.toml |  2 +-
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 00c56e99..fea48f50 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,18 +4,21 @@ 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
- - poetry run behave
+  - poetry run python --version
+  - poetry run behave
 before_deploy:
   - pip install poetry
   - poetry config http-basic.pypi $PYPI_USER $PYPI_PASS
+  - poetry version $TRAVIS_TAG
   - poetry build
 deploy:
-  provider: script
-  script: poetry publish
-  skip_cleanup: true
-  on:
-    branch: master
-    tags: true
+  - provider: script
+    script: poetry publish
+    skip_cleanup: true
+    on:
+      branch: master
+      tags: true
diff --git a/Makefile b/Makefile
index de491e1f..79803508 100644
--- a/Makefile
+++ b/Makefile
@@ -13,10 +13,6 @@ clean:
 html:
 	poetry run mkdocs serve
 
-# Build GitHub Page from docs
-docs:
-	poetry run mkdocs gh-deploy
-
 format: ## check style with flake8
 	poetry run black features jrnl
 
@@ -26,12 +22,8 @@ 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
-	poetry publish
-	poetry run mkdocs gh-deploy
-
 install: clean ## install the package to the active Python's site-packages
 	poetry install
diff --git a/pyproject.toml b/pyproject.toml
index 7c2f123a..1b84acde 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 <manuel@1450.me>",