Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Poetry for dependency management and deployments #612

Merged
merged 2 commits into from
Aug 16, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

# C extensions
*.so
.python-version

# Packages
*.egg
Expand Down
24 changes: 17 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
dist: xenial # required for Python >= 3.7
language: python
python:
- "3.7"
python: "3.7"
before_install:
- pip install poetry
install:
- "pip install -e ."
- "pip install -q behave"
# command to run tests
- poetry install
script:
- python --version
- behave
- poetry run python --version
- poetry run behave
before_deploy:
- pip install poetry
- poetry config http-basic.pypi $PYPI_USER $PYPI_PASS
- poetry build
deploy:
provider: script
script: poetry publish
skip_cleanup: true
on:
branch: master
tags: true
3 changes: 0 additions & 3 deletions MANIFEST.in

This file was deleted.

23 changes: 19 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ clean:
rm -rf dist
rm -rf _static
rm -rf jrnl.egg-info
rm -rf docs/_build
rm -rf _build
rm -rf _sources
rm -rf _static
rm -rf site/
rm -f *.html

html:
Expand All @@ -17,6 +17,21 @@ html:
docs:
mkdocs gh-deploy

# Upload to pipy
dist:
python setup.py publish
format: ## check style with flake8
poetry run black features jrnl

lint: ## check style with flake8
poetry run flake8 jrnl features --ignore E501

test: ## Run behave tests
poetry run behave

dist: clean ## builds source and wheel package
poetry build

release: dist ## package and upload a release
poetry publish
mkdocs gh-deploy

install: clean ## install the package to the active Python's site-packages
poetry install
13 changes: 4 additions & 9 deletions jrnl/__init__.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
#!/usr/bin/env python
# encoding: utf-8

import pkg_resources

"""
jrnl is a simple journal application for your command line.
"""
from __future__ import absolute_import
dist = pkg_resources.get_distribution('jrnl')
__title__ = dist.project_name
__version__ = dist.version

__title__ = 'jrnl'
__version__ = '2.0.0-rc3'
__author__ = 'Manuel Ebert'
__license__ = 'MIT License'
__copyright__ = 'Copyright 2013 - 2015 Manuel Ebert'
Loading