From 6e2de8e3a2e2c5586e876ca305f0844bdd822db3 Mon Sep 17 00:00:00 2001
From: Pierre Sassoulas <pierre.sassoulas@gmail.com>
Date: Sun, 21 Feb 2021 15:41:31 +0100
Subject: [PATCH] Upgrade version to 2.7.0 and fix astroid to 2.5.0

---
 pylint/__pkginfo__.py      | 4 ++--
 requirements_test_pypy.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pylint/__pkginfo__.py b/pylint/__pkginfo__.py
index f87f96829d..82f4e54ddf 100644
--- a/pylint/__pkginfo__.py
+++ b/pylint/__pkginfo__.py
@@ -31,7 +31,7 @@
 from os.path import join
 
 # For an official release, use dev_version = None
-numversion = (2, 6, 1)
+numversion = (2, 7, 0)
 dev_version = 1
 
 version = ".".join(str(num) for num in numversion)
@@ -39,7 +39,7 @@
     version += "-dev" + str(dev_version)
 
 install_requires = [
-    "astroid>=2.4.0,<=2.6",
+    "astroid==2.5.0",
     "isort>=4.2.5,<6",
     "mccabe>=0.6,<0.7",
     "toml>=0.7.1",
diff --git a/requirements_test_pypy.txt b/requirements_test_pypy.txt
index b3586ae7d4..b64d5cdf96 100644
--- a/requirements_test_pypy.txt
+++ b/requirements_test_pypy.txt
@@ -1,4 +1,4 @@
-astroid @ git+git://github.com/PyCQA/astroid.git@master
+astroid @ git+git://github.com/PyCQA/astroid.git@astroid-2.5
 coveralls
 coverage<5.0
 pytest