Skip to content

Commit

Permalink
Merge pull request #683 from wren/deployment-testing
Browse files Browse the repository at this point in the history
[#681] Update version handling in source and travis deployments
  • Loading branch information
micahellison committed Oct 19, 2019
2 parents 4735749 + 675ef51 commit 8433ade
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
6 changes: 4 additions & 2 deletions .travis.yml
Expand Up @@ -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
Expand All @@ -12,10 +14,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:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion 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>",
Expand Down

0 comments on commit 8433ade

Please sign in to comment.