From da535080cccead1e0f770e622af09b812bb2416d Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Wed, 1 Dec 2021 16:15:54 +0500 Subject: [PATCH] mysqlclient upgrade (#29418) * fix: upgrading the mysqlclient==2.1.0 --- .github/workflows/pylint-checks.yml | 2 ++ requirements/constraints.txt | 2 -- requirements/edx/base.txt | 6 ++---- requirements/edx/development.txt | 6 ++---- requirements/edx/testing.txt | 6 ++---- 5 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.github/workflows/pylint-checks.yml b/.github/workflows/pylint-checks.yml index b93f13c4d0..167fc4b963 100644 --- a/.github/workflows/pylint-checks.yml +++ b/.github/workflows/pylint-checks.yml @@ -58,6 +58,8 @@ jobs: run: | pip install -r requirements/pip.txt pip install -r requirements/edx/development.txt --src ${{ runner.temp }} + pip uninstall -y mysqlclient + pip install --no-binary mysqlclient mysqlclient - name: Run Quality Tests run: | diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 67dade0c0e..3d1583bdba 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -97,5 +97,3 @@ py2neo<2022 # Sphinx requires docutils<0.18. This pin can be removed once https://github.com/sphinx-doc/sphinx/issues/9777 is closed. docutils<0.18 -# mysqlclient==2.1.0 caused NameError in running pylint checks on master -mysqlclient<2.1.0 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 1ec83d47ed..8ed4d7cc3f 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -667,10 +667,8 @@ multidict==5.2.0 # via # aiohttp # yarl -mysqlclient==2.0.3 - # via - # -c requirements/edx/../constraints.txt - # -r requirements/edx/base.in +mysqlclient==2.1.0 + # via -r requirements/edx/base.in newrelic==7.2.4.171 # via # -r requirements/edx/base.in diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index b9ad5fb927..cdf74562fd 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -902,10 +902,8 @@ mypy==0.910 # via -r requirements/edx/development.in mypy-extensions==0.4.3 # via mypy -mysqlclient==2.0.3 - # via - # -c requirements/edx/../constraints.txt - # -r requirements/edx/testing.txt +mysqlclient==2.1.0 + # via -r requirements/edx/testing.txt newrelic==7.2.4.171 # via # -r requirements/edx/testing.txt diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 47cbeaaee2..7e7092ad89 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -851,10 +851,8 @@ multidict==5.2.0 # -r requirements/edx/base.txt # aiohttp # yarl -mysqlclient==2.0.3 - # via - # -c requirements/edx/../constraints.txt - # -r requirements/edx/base.txt +mysqlclient==2.1.0 + # via -r requirements/edx/base.txt newrelic==7.2.4.171 # via # -r requirements/edx/base.txt