Merge pull request #31 from edx/jenkins/upgrade-python-requirements-0…

…e7b302 Python Requirements Update
openedx · Sep 7, 2021 · 364e574 · 364e574
2 parents 0e7b302 + 1a1908b
commit 364e574
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -31,7 +31,7 @@ web-fragments==1.1.0
  # xblock
 webob==1.8.7
  # via xblock
-xblock==1.5.0
+xblock==1.5.1
  # via -r requirements/base.in
 
 # The following packages are considered to be unsafe in a requirements file:

diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt
@@ -41,7 +41,3 @@ social-auth-core<4.0.3
 # elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
 # elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
 elasticsearch<7.14.0
-
-# pluggy released 1.0.0, but pytest limits to <1.0.0 and tox does not, so they disagree on the version to use.
-# This pin can be removed once pytest ships 6.2.5 which will remove the upper limit on the pluggy version.
-pluggy<1.0.0
diff --git a/requirements/test.txt b/requirements/test.txt
@@ -12,13 +12,13 @@ iniconfig==1.1.1
  # via pytest
 packaging==21.0
  # via pytest
-pluggy==0.13.1
+pluggy==1.0.0
  # via pytest
 py==1.10.0
  # via pytest
 pyparsing==2.4.7
  # via packaging
-pytest==6.2.4
+pytest==6.2.5
  # via pytest-cov
 pytest-cov==2.12.1
  # via -r requirements/test.in