Skip to content

Commit

Permalink
Merge pull request #110 from hakonanes/post-release-changes
Browse files Browse the repository at this point in the history
Bump version to 0.2.0.dev0, deploy only on tags, add pypi badges
  • Loading branch information
hakonanes committed Jan 4, 2020
2 parents 5d6dbf4 + 947b65a commit 063b4e5
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 10 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ matrix:
- name: "Python 3.7 with pip on macOS 10.14"
os: osx
osx_image: xcode11.3
env: export ENV=pip; DEPLOY=true
env: export ENV=pip
addons:
homebrew:
packages:
- python3

- name: "Python 3.7 with conda on Windows Server, version 1803"
os: windows
env: PATH="/c/tools/miniconda3/:/c/tools/miniconda3/Scripts:$PATH"; DEPLOY=true
env: PATH="/c/tools/miniconda3/:/c/tools/miniconda3/Scripts:$PATH"

- name: "Python 3.7 with pip on Windows Server, version 1803"
os: windows
Expand Down Expand Up @@ -81,6 +81,6 @@ deploy:
distributions: "sdist bdist_wheel"
skip_existing: true
on:
# tags: true
tags: true
condition: $DEPLOY = true
edge: true # v2 of dpl
edge: true # v2 of Travis CI's deployment tool dpl
14 changes: 10 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
[![Build Status](https://api.travis-ci.org/kikuchipy/kikuchipy.svg?branch=master)](https://travis-ci.org/kikuchipy/kikuchipy) [![Coverage Status](https://coveralls.io/repos/github/kikuchipy/kikuchipy/badge.svg?branch=master)](https://coveralls.io/github/kikuchipy/kikuchipy?branch=master) [![Documentation Status](https://readthedocs.org/projects/kikuchipy/badge/?version=latest)](https://kikuchipy.readthedocs.io/en/latest/?badge=latest) [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) [![DOI](https://zenodo.org/badge/160169099.svg)](https://zenodo.org/badge/latestdoi/160169099)
[![Build Status](https://api.travis-ci.org/kikuchipy/kikuchipy.svg?branch=master)](https://travis-ci.org/kikuchipy/kikuchipy)
[![Coverage Status](https://coveralls.io/repos/github/kikuchipy/kikuchipy/badge.svg?branch=master)](https://coveralls.io/github/kikuchipy/kikuchipy?branch=master)
[![Documentation Status](https://readthedocs.org/projects/kikuchipy/badge/?version=latest)](https://kikuchipy.readthedocs.io/en/latest/?badge=latest)
![PyPI](https://img.shields.io/pypi/v/kikuchipy.svg?style=flat)
![PyPI - Downloads](https://img.shields.io/pypi/dm/kikuchipy.svg?style=flat)
[![DOI](https://zenodo.org/badge/160169099.svg?)](https://zenodo.org/badge/latestdoi/160169099)
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg?style=flat)](https://github.com/psf/black)

*KikuchiPy is an open-source Python library for processing and analysis of
electron backscatter diffraction (EBSD) patterns.*
Expand All @@ -13,18 +19,18 @@ changes with each release.

KikuchiPy is released under the GPL v3 license.

#### User guide
### User guide

Installation instructions, a user guide and the full API reference is available
[here](https://kikuchipy.readthedocs.io) via Read the Docs.

#### Contributing
### Contributing

Everyone is welcome to contribute. Please read our
[contributor guide](https://kikuchipy.readthedocs.io/en/latest/contributing.html)
to get started!

#### Cite
### Cite

If analysis using KikuchiPy forms a part of published work, please consider
recognizing the code development by citing the DOI above.
2 changes: 1 addition & 1 deletion kikuchipy/release.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
maintainer_email = "hakon.w.anes@ntnu.no"
name = "kikuchipy"
status = "Development"
version = "0.1.0"
version = "0.2.0.dev0"
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"scanning electron microscopy",
"kikuchi pattern",
],
url="https://github.com/kikuchipy/kikuchipy",
url="https://kikuchipy.readthedocs.io",
package_dir={"kikuchipy": "kikuchipy"},
classifiers=[
"Programming Language :: Python :: 3",
Expand Down

0 comments on commit 063b4e5

Please sign in to comment.