Update changelog and update version to v0.1.3 (#161)

* Update changelog and update version to v0.1.3 Signed-off-by: Håkon Wiik Ånes <[email protected]> * Update Travis CI with stuff from master... Signed-off-by: Håkon Wiik Ånes <[email protected]> * Pin scikit-image to > 0.16, < 0.17 Signed-off-by: Håkon Wiik Ånes <[email protected]> * Clarifying comments for version range Signed-off-by: Håkon Wiik Ånes <[email protected]>
pyxem · May 11, 2020 · c5e6ffb · c5e6ffb
1 parent 9aad111
commit c5e6ffb
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 39 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,54 +1,60 @@
 # The setup of different files for installation and tests on different
-# operating systems are based upon how HyperSpy does it:
-# https://github.com/hyperspy/hyperspy/blob/RELEASE_next_minor/.travis.yml
+# operating systems are based upon how HyperSpy did it.
 
-language: shell
+language: shell # python is not recognised on osx or windows
+os: linux
+dist: bionic
 
 env:
   global:
-    - ENV=conda
-    - DEPS="hyperspy pyxem dask[array] h5py matplotlib numpy scikit-image scikit-learn scipy"
-    - TEST_DEPS="pytest pytest-cov coveralls coverage==4.5.4"
-    - PYTHON_CONDA=3.7
+    - DEPS="dask[array] hyperspy h5py matplotlib numpy pyxem scikit-image scikit-learn scipy"
+    - TEST_DEPS="pytest pytest-cov coveralls coverage"
     - DEPLOY=false
 
-matrix:
+jobs:
   include:
-    - name: "Python 3.7 with conda on Linux Ubuntu 18.04"
+    - name: "Python 3.7.6 with conda on Linux Ubuntu 18.04"
       os: linux
       dist: bionic
-      language: python
-      python: 3.7
+      env:
+        - ENV=conda
+        - PYTHON_VERSION=3.7
 
-    - name: "Python 3.7 with pip on Linux Ubuntu 18.04"
+    - name: "Python 3.7.6 with pip on Linux Ubuntu 18.04"
       os: linux
       dist: bionic
-      language: python
-      python: 3.7
-      env: export ENV=pip; DEPLOY=true
+      language: python # virtualenv needed
+      python: "3.7"
+      env:
+        - ENV=pip
+        - DEPLOY=true
 
     - name: "Python 3.7 with conda on macOS 10.14"
       os: osx
       osx_image: xcode11.3
+      env:
+        - ENV=conda
+        - PYTHON_VERSION=3.7
 
-    - name: "Python 3.7 with pip on macOS 10.14"
+    - name: "Python 3.7.6 with pip on macOS 10.14"
       os: osx
       osx_image: xcode11.3
-      env: export ENV=pip
-      addons:
-        homebrew:
-          packages:
-            - python3
+      env:
+        - ENV=pip
 
-    - name: "Python 3.7 with conda on Windows Server, version 1803"
+    - name: "Python 3.7 with conda on Windows"
       os: windows
-      env: PATH="/c/tools/miniconda3/:/c/tools/miniconda3/Scripts:$PATH"
+      env:
+        - ENV=conda
+        - PYTHON_VERSION=3.7
+        - PATH="/c/tools/miniconda3/:/c/tools/miniconda3/Scripts:$PATH"
 
-    - name: "Python 3.7 with pip on Windows Server, version 1803"
+    - name: "Python 3.7.5 with pip on Windows"
       os: windows
-      env: export ENV=pip; PATH="/c/Python37:/c/Python37/Scripts:$PATH";
-
-sudo: True # for Miniconda
+      env:
+        - ENV=pip
+        - PYTHON_VERSION=3.7.5
+        - PATH="/c/Python37:/c/Python37/Scripts:$PATH"
 
 before_install:
   # Set up conda for the different operating systems
@@ -60,8 +66,8 @@ install:
   # Install dependencies with conda or pip
   - source ./ci/travis_install_with_$ENV.sh
 
-  # Install KikuchiPy
-  - pip install -e .
+  # Install kikuchipy
+  - pip install --upgrade --editable .
 
 script:
   - export MPLBACKEND=Agg
@@ -74,7 +80,7 @@ after_success:
 # Source: https://docs.travis-ci.com/user/deployment/pypi/
 deploy:
   provider: pypi
-  user: "__token__"
+  username: "__token__"
   password:
     # For username hakonanes
     secure: "gJHlUERp8w1HYbJfVw0FNIpYzeBkUsg6qKu62FTYd2finjPCkaLauX6ZbmA4dtyi0H8ydoIXUFg8NcBntNYgSNmdNDO5DzsTI1VKhoiKUjbEIOhzEOT9sdrLgj9C2pa7AoSC1L9TQ8iy+YxsZVF/blm3DMeEQ9eTAmJvbEiEd3Xgqy1CqxTJ6jfV/YXHbVyBFwCY5/Q9ckYqqdePJrCJRK/ozGVLJu5a3apetZeGVZF28Ma5/dMSAClei4JqaWE2ULSUsUgZeLEY/SbtyO+/kDgy0MM7Zjpc2p3rLiLVmWwOSQQWQTvm4jGD7v/3QRl5DiaVFT9J7RD//tzlzXroYe5lkZ6wKExnEB2hUU6yW7czAi+Z2g49OSVG0HKaMj9ihfg+PIIJ/Dqf1Fz7HwBC93cW/Co/1DAF8sB2VfbrVfUQs+4XE1nj1c+60l0xq+5cnDcCwvhLc8GYc+GxxsK1UNM/off4HGIbKn2pj0v16grhqL9rSNTZ2UB2R6NUUdQCXH3JNbORPRgbdUdi+xNwB3b3T1M5U4VVWN/ElXH0Kw1dJ6jQt61j7ZMnVKl1NM9H4+dJ6SpgH3IKn3XD7SRSxXLF1RleJ59YpDLdo/AYKC5iesJJCTgil1ODOI0yEPF77V9/XJp0bHIeHtROtSIpWErgte+JYWLt4Wc3LLRkbNI="

diff --git a/ci/travis_install_with_conda.sh b/ci/travis_install_with_conda.sh
@@ -5,7 +5,7 @@ fi
 
 conda update --yes conda
 conda config --append channels conda-forge
-conda create --name testenv --yes python=$PYTHON_CONDA
+conda create --name testenv --yes python=$PYTHON_VERSION
 
 if [[ "$TRAVIS_OS_NAME" =~ ^(linux|osx)$ ]]; then
   conda activate testenv
@@ -14,5 +14,5 @@ else # windows
 fi
 
 # Install package with conda
-conda install --yes $DEPS $TEST_DEPS
+conda install --yes $TEST_DEPS
 conda info
diff --git a/ci/travis_install_with_pip.sh b/ci/travis_install_with_pip.sh
@@ -5,7 +5,7 @@
 
 # Install Python version 3.7 on Windows
 if [ "$TRAVIS_OS_NAME" == windows ]; then
-  choco install -y python --version=3.7.5 --allow-downgrades
+  choco install -y python --version=$PYTHON_VERSION --allow-downgrades
   python -m pip install --upgrade pip
 fi
 

diff --git a/ci/travis_setup_conda_linux.sh b/ci/travis_setup_conda_linux.sh
@@ -1,4 +1,4 @@
 # Install Miniconda
 wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
 chmod +x miniconda.sh
-./miniconda.sh -b -p $HOME/miniconda
+bash miniconda.sh -b -p $HOME/miniconda
diff --git a/ci/travis_setup_conda_osx.sh b/ci/travis_setup_conda_osx.sh
@@ -1,4 +1,6 @@
+sudo Xvfb :99 -ac -screen 0 1024x768x8 &
+sleep 1 # give xvfb some time to start
+
 # Install Miniconda
-curl https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -o miniconda.sh
-chmod +x miniconda.sh
-./miniconda.sh -b -p $HOME/miniconda
+wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh
+bash miniconda.sh -b -p $HOME/miniconda
diff --git a/doc/changelog.rst b/doc/changelog.rst
@@ -2,6 +2,27 @@
 Changelog
 =========
 
+0.1.3 (2020-05-11)
+==================
+
+KikuchiPy is an open-source Python library for processing and analysis of
+electron backscatter diffraction patterns: https://kikuchipy.readthedocs.io
+
+This is a patch release. It is anticipated to be the final release in the
+`0.1.x` series.
+
+Added
+-----
+- Package installation with Anaconda via the `conda-forge channel
+  <https://anaconda.org/conda-forge/kikuchipy/>`_.
+
+Fixed
+-----
+- Static and dynamic background corrections are done at float 32-bit precision,
+  and not integer 16-bit.
+- Chunking of static background pattern.
+- Chunking of patterns in the h5ebsd reader.
+
 0.1.2 (2020-01-09)
 ==================
 

diff --git a/kikuchipy/release.py b/kikuchipy/release.py
@@ -25,4 +25,4 @@
 name = "kikuchipy"
 platforms = ["Linux", "MacOS X", "Windows"]
 status = "Development"
-version = "0.1.3.dev0"
+version = "0.1.3"
diff --git a/setup.py b/setup.py
@@ -109,7 +109,7 @@
         "matplotlib",
         "numpy >= 1.17",
         "pyxem >= 0.10",
-        "scikit-image",
+        "scikit-image >= 0.16, < 0.17",  # Due to HyperSpy PR #2393
         "scikit-learn",
         "scipy",
     ],