diff options
| author | Jonathan Wren <jonathan@nowandwren.com> | 2019-10-19 13:03:57 -0700 |
|---|---|---|
| committer | Jonathan Wren <jonathan@nowandwren.com> | 2020-04-10 11:51:55 -0700 |
| commit | f7953fdd6191d085ed5157d89efcdf6218904ebe (patch) | |
| tree | 30f96c6349783911eaf3127eb4a15a18905884a9 | |
| parent | 8c0c95d1f6e8ff830ac5d7248ac1d167c7d21755 (diff) | |
[#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
| -rw-r--r-- | .travis.yml | 19 | ||||
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | 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 @@ -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>", |