Feature/pytorch1.2.0 (#633)

* Add 1.2.0, remove 0.4.x * Formatting * Url hack * Update version references * Update badge
pytorchbearer · Sep 17, 2019 · 6dab5ca · 6dab5ca
1 parent 2ca4024
commit 6dab5ca
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,30 +1,24 @@
 language: python
 matrix:
   include:
-    - python: "2.7"
-      env: TORCH_VERSION=0.4.0 TORCH_URL=http://download.pytorch.org/whl/cpu/torch-0.4.0-cp27-cp27mu-linux_x86_64.whl TORCHVISION=torchvision==0.2.2.post3
-    - python: "2.7"
-      env: TORCH_VERSION=0.4.1 TORCH_URL=http://download.pytorch.org/whl/cpu/torch-0.4.1-cp27-cp27mu-linux_x86_64.whl TORCHVISION=torchvision==0.2.2.post3
     - python: "2.7"
       env: TORCH_VERSION=1.0.0 TORCH_URL=http://download.pytorch.org/whl/cpu/torch-1.0.0-cp27-cp27mu-linux_x86_64.whl TORCHVISION=torchvision==0.2.2.post3
     - python: "2.7"
       env: TORCH_VERSION=1.1.0 TORCH_URL=http://download.pytorch.org/whl/cpu/torch-1.1.0-cp27-cp27mu-linux_x86_64.whl TORCHVISION=https://download.pytorch.org/whl/cpu/torchvision-0.3.0-cp27-cp27mu-linux_x86_64.whl
-    - python: "3.5"
+    - python: "2.7"
-      env: TORCH_VERSION=0.4.0 TORCH_URL=http://download.pytorch.org/whl/cpu/torch-0.4.0-cp35-cp35m-linux_x86_64.whl TORCHVISION=torchvision==0.2.2.post3
+      env: TORCH_VERSION=1.2.0 TORCH_URL="torch==1.2.0+cpu -f https://download.pytorch.org/whl/torch_stable.html" TORCHVISION="torchvision==0.4.0+cpu -f https://download.pytorch.org/whl/torch_stable.html"
-    - python: "3.5"
-      env: TORCH_VERSION=0.4.1 TORCH_URL=http://download.pytorch.org/whl/cpu/torch-0.4.1-cp35-cp35m-linux_x86_64.whl TORCHVISION=torchvision==0.2.2.post3
     - python: "3.5"
       env: TORCH_VERSION=1.0.0 TORCH_URL=http://download.pytorch.org/whl/cpu/torch-1.0.0-cp35-cp35m-linux_x86_64.whl TORCHVISION=torchvision==0.2.2.post3
     - python: "3.5"
       env: TORCH_VERSION=1.1.0 TORCH_URL=http://download.pytorch.org/whl/cpu/torch-1.1.0-cp35-cp35m-linux_x86_64.whl TORCHVISION=https://download.pytorch.org/whl/cpu/torchvision-0.3.0-cp35-cp35m-linux_x86_64.whl
-    - python: "3.6"
+    - python: "3.5"
-      env: TORCH_VERSION=0.4.0 TORCH_URL=http://download.pytorch.org/whl/cpu/torch-0.4.0-cp36-cp36m-linux_x86_64.whl TORCHVISION=torchvision==0.2.2.post3
+      env: TORCH_VERSION=1.2.0 TORCH_URL="torch==1.2.0+cpu -f https://download.pytorch.org/whl/torch_stable.html" TORCHVISION="torchvision==0.4.0+cpu -f https://download.pytorch.org/whl/torch_stable.html"
-    - python: "3.6"
-      env: TORCH_VERSION=0.4.1 TORCH_URL=http://download.pytorch.org/whl/cpu/torch-0.4.1-cp36-cp36m-linux_x86_64.whl TORCHVISION=torchvision==0.2.2.post3
     - python: "3.6"
       env: TORCH_VERSION=1.0.0 TORCH_URL=http://download.pytorch.org/whl/cpu/torch-1.0.0-cp36-cp36m-linux_x86_64.whl TORCHVISION=torchvision==0.2.2.post3
     - python: "3.6"
       env: TORCH_VERSION=1.1.0 TORCH_URL=http://download.pytorch.org/whl/cpu/torch-1.1.0-cp36-cp36m-linux_x86_64.whl TORCHVISION=https://download.pytorch.org/whl/cpu/torchvision-0.3.0-cp36-cp36m-linux_x86_64.whl
+    - python: "3.6"
+      env: TORCH_VERSION=1.2.0 TORCH_URL="torch==1.2.0+cpu -f https://download.pytorch.org/whl/torch_stable.html" TORCHVISION="torchvision==0.4.0+cpu -f https://download.pytorch.org/whl/torch_stable.html"
     - python: "3.7"
       dist: xenial
       sudo: true
@@ -33,6 +27,10 @@ matrix:
       dist: xenial
       sudo: true
       env: TORCH_VERSION=1.1.0 TORCH_URL=http://download.pytorch.org/whl/cpu/torch-1.1.0-cp37-cp37m-linux_x86_64.whl TORCHVISION=https://download.pytorch.org/whl/cpu/torchvision-0.3.0-cp37-cp37m-linux_x86_64.whl
+    - python: "3.7"
+      dist: xenial
+      sudo: true
+      env: TORCH_VERSION=1.2.0 TORCH_URL="torch==1.2.0+cpu -f https://download.pytorch.org/whl/torch_stable.html" TORCHVISION="torchvision==0.4.0+cpu -f https://download.pytorch.org/whl/torch_stable.html"
 before_install:
   - echo $TRAVIS_COMMIT_RANGE
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 ### Deprecated
 ### Removed
 - Cyclic LR callback in favour of torch cyclic lr scheduler
+- Removed support for PyTorch 0.4.x
 ### Fixed
 - Fixed bug where aggregate predictions couldn't handle empty list
 - Fixed a bug where Runtime Errors on forward weren't handled properly

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 <img alt="logo" src="https://raw.githubusercontent.com/pytorchbearer/torchbearer/master/docs/_static/img/logo_dark_text.svg?sanitize=true" width="100%"/>
 
-[![PyPI version](https://badge.fury.io/py/torchbearer.svg)](https://badge.fury.io/py/torchbearer) [![Python 2.7 | 3.5 | 3.6 | 3.7](https://img.shields.io/badge/python-2.7%20%7C%203.5%20%7C%203.6%20%7C%203.7-brightgreen.svg)](https://www.python.org/) [![PyTorch 0.4.0 | 0.4.1 | 1.0.0 | 1.1.0](https://img.shields.io/badge/pytorch-0.4.0%20%7C%200.4.1%20%7C%201.0.0%20%7C%201.1.0-brightgreen.svg)](https://pytorch.org/) [![Build Status](https://travis-ci.com/pytorchbearer/torchbearer.svg?branch=master)](https://travis-ci.com/pytorchbearer/torchbearer) [![codecov](https://codecov.io/gh/pytorchbearer/torchbearer/branch/master/graph/badge.svg)](https://codecov.io/gh/pytorchbearer/torchbearer) [![Documentation Status](https://readthedocs.org/projects/torchbearer/badge/?version=latest)](https://torchbearer.readthedocs.io/en/latest/?badge=latest) [![Downloads](https://pepy.tech/badge/torchbearer)](https://pepy.tech/project/torchbearer)
+[![PyPI version](https://badge.fury.io/py/torchbearer.svg)](https://badge.fury.io/py/torchbearer) [![Python 2.7 | 3.5 | 3.6 | 3.7](https://img.shields.io/badge/python-2.7%20%7C%203.5%20%7C%203.6%20%7C%203.7-brightgreen.svg)](https://www.python.org/) [![PyTorch 1.0.0 | 1.1.0 | 1.2.0](https://img.shields.io/badge/pytorch-1.0.0%20%7C%201.1.0%20%7C%201.2.0-brightgreen.svg)](https://pytorch.org/) [![Build Status](https://travis-ci.com/pytorchbearer/torchbearer.svg?branch=master)](https://travis-ci.com/pytorchbearer/torchbearer) [![codecov](https://codecov.io/gh/pytorchbearer/torchbearer/branch/master/graph/badge.svg)](https://codecov.io/gh/pytorchbearer/torchbearer) [![Documentation Status](https://readthedocs.org/projects/torchbearer/badge/?version=latest)](https://torchbearer.readthedocs.io/en/latest/?badge=latest) [![Downloads](https://pepy.tech/badge/torchbearer)](https://pepy.tech/project/torchbearer)
 
 <p align="center">
   <a href="http://pytorchbearer.org">Website</a> •

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-torch>=0.4
+torch>=1.0.0
 numpy
 scikit-learn
 tqdm

diff --git a/setup.py b/setup.py
@@ -26,6 +26,6 @@
     description='A model training library for pytorch',
     long_description=long_description,
     long_description_content_type='text/markdown',
-    install_requires=['torch>=0.4', 'numpy', 'tqdm'],
+    install_requires=['torch>=1.0.0', 'numpy', 'tqdm'],
     python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*',
 )
diff --git a/torchbearer/version.py b/torchbearer/version.py
@@ -1 +1 @@
-__version__ = '1.0.0.dev'
+__version__ = '0.5.0.dev'