Merge branch 'main' into dependabot/pip/matplotlib-3.3.2

beat-buesser · web-flow · commit 9c9189950b62 · 2020-09-21T00:00:53.000+01:00
diff --git a/AUTHORS b/AUTHORS
@@ -8,3 +8,4 @@
 - Two Six Labs, LLC
 - Kyushu University
 - Intel Corporation
+- University of Chicago
diff --git a/README-cn.md b/README-cn.md
@@ -1,4 +1,4 @@
-# Adversarial Robustness Toolbox (ART) v1.3
+# Adversarial Robustness Toolbox (ART) v1.4
 <p align="center">
   <img src="docs/images/art_lfai.png?raw=true" width="467" title="ART logo">
 </p>
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Adversarial Robustness Toolbox (ART) v1.3
+# Adversarial Robustness Toolbox (ART) v1.4
 <p align="center">
   <img src="docs/images/art_lfai.png?raw=true" width="467" title="ART logo">
 </p>
diff --git a/art/__init__.py b/art/__init__.py
@@ -11,7 +11,7 @@
 from art import wrappers
 
 # Semantic Version
-__version__ = "1.3.3"
+__version__ = "1.4.0"
 
 # pylint: disable=C0103
 
diff --git a/docs/conf.py b/docs/conf.py
@@ -24,9 +24,9 @@
 author = 'Maria-Irina Nicolae'
 
 # The short X.Y version
-version = '1.3'
+version = '1.4'
 # The full version, including alpha/beta/rc tags
-release = '1.3.3'
+release = '1.4.0'
 
 
 # -- General configuration ---------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Adversarial Robustness Toolbox (ART) v1.3`
	`1`	`+# Adversarial Robustness Toolbox (ART) v1.4`
`2`	`2`	`<p align="center">`
`3`	`3`	`<img src="docs/images/art_lfai.png?raw=true" width="467" title="ART logo">`
`4`	`4`	`</p>`