Merge branch 'master' into master

Author: Pierre-Sassoulas

ChangeLog

@@ -10,6 +10,11 @@ Release Date: TBA
 
   Fixes PyCQA/pylint#4040
 
+* The ``context.path`` is reverted to a set because otherwise it leds to false positives 
+  for non `numpy` functions.
+
+  Closes #895 #899
+
 
 What's New in astroid 2.5?
 ============================

astroid/__pkginfo__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (c) 2006-2014 LOGILAB S.A. (Paris, FRANCE) <[email protected]>
 # Copyright (c) 2014-2020 Claudiu Popa <[email protected]>
 # Copyright (c) 2014 Google, Inc.
@@ -25,7 +24,7 @@
 
 """astroid packaging information"""
 
-version = "2.5"
+version = "2.5-dev"
 numversion = tuple(int(elem) for elem in version.split(".") if elem.isdigit())
 
 extras_require = {}