minor updates, deprecate p2.7

Author: 1adrianb

.travis.yml

@@ -1,7 +1,6 @@
 dist: xenial
 language: python
 python:
-  - "2.7"
   - "3.5"
   - "3.6"
   - "3.7"
@@ -16,11 +15,7 @@ notifications:
 install:
   - sudo apt-get update
   - sudo apt-get install cmake libboost-python-dev
-  - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
-      wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh;
-    else
-      wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
-    fi;
+  - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
   - bash miniconda.sh -b -p $HOME/miniconda
   - export PATH="$HOME/miniconda/bin:$PATH"
   - hash -r
@@ -33,7 +28,6 @@ install:
   - source activate test-environment
   - travis_retry pip install --upgrade pip setuptools wheel
   - travis_retry pip install -r requirements.txt
-  - if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then pip install enum34; fi
   - pip install dlib
   - python setup.py install
   - pip install --upgrade pytest
@@ -51,6 +45,6 @@ script:
 matrix:
   include:
     - env: LINT_CHECK
-      python: "2.7"
+      python: "3.6"
       install: pip install flake8
       script: flake8

Dockerfile

@@ -1,5 +1,5 @@
 # Based on https://github.com/pytorch/pytorch/blob/master/Dockerfile
-FROM nvidia/cuda:9.2-cudnn7-devel-ubuntu16.04 
+FROM nvidia/cuda:10.1-cudnn7-devel-ubuntu18.04
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
          build-essential \
@@ -22,7 +22,7 @@ RUN curl -o ~/miniconda.sh -O  https://repo.continuum.io/miniconda/Miniconda3-la
 ENV PATH /opt/conda/bin:$PATH
 
 RUN conda config --set always_yes yes --set changeps1 no && conda update -q conda 
-RUN conda install pytorch torchvision cuda92 -c pytorch
+RUN conda install pytorch torchvision cudatoolkit=10.1 -c pytorch
 
 # Install face-alignment package
 WORKDIR /workspace

README.md

@@ -85,7 +85,7 @@ Please also see the ``examples`` folder
 
 ### Requirements
 
-* Python 3.5+ or Python 2.7 (it may work with other versions too)
+* Python 3.5+ or Python 2.7 (it may work with other versions too). Support for Python 2.7 is deprecated.
 * Linux, Windows or macOS
 * pytorch (>=1.0)
 

conda/conda_upload.sh

@@ -4,4 +4,4 @@ USER=1adrianb
 mkdir ~/conda-build
 conda config --set anaconda_upload no
 conda build conda/
-anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER /home/travis/miniconda/envs/test-environment/conda-bld/noarch/face_alignment-1.0.1-py_1.tar.bz2 --force
+anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER /home/travis/miniconda/envs/test-environment/conda-bld/noarch/face_alignment-1.1.1-py_1.tar.bz2 --force

conda/meta.yaml

@@ -1,4 +1,4 @@
-{% set version = "1.1.0" %}
+{% set version = "1.1.1" %}
 
 package:
   name: face_alignment

face_alignment/__init__.py

@@ -2,6 +2,6 @@
 
 __author__ = """Adrian Bulat"""
 __email__ = '[email protected]'
-__version__ = '1.1.0'
+__version__ = '1.1.1'
 
 from .api import FaceAlignment, LandmarksType, NetworkSize

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.1.0
+current_version = 1.1.1
 commit = True
 tag = True