Skip to content
This repository has been archived by the owner on Mar 12, 2024. It is now read-only.

Commit

Permalink
Merge pull request #694 from openedx/jdmulloy/requirements_sync
Browse files Browse the repository at this point in the history
chore: Unpin requirements, sync with configuration
  • Loading branch information
jdmulloy authored Sep 25, 2023
2 parents 86fed5a + f5546cf commit 4f6683f
Show file tree
Hide file tree
Showing 6 changed files with 90 additions and 79 deletions.
33 changes: 17 additions & 16 deletions requirements/base.in
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
-c constraints.txt

backoff==1.5.0
backoff
boto3
click-log
click>=7.0.0
click
cloudflare
edx-opaque-keys==0.4.0
edx-rest-api-client==5.5.0
freezegun==0.3.8
GitPython==3.1.18
google-api-python-client==1.7.3
jenkinsapi==0.3.3
kubernetes==12.0.1
edx-opaque-keys
edx-rest-api-client
freezegun
GitPython
google-api-python-client
jenkinsapi
jinja2
kubernetes
PyGithub
pymongo==3.5.1
pytz==2016.10
pyyaml==5.4
requests>=2.9.1,<3.0
pymongo
pytz
pyyaml
requests
sailthru-client
simple-salesforce
six
unicodecsv==0.14.1
unicodecsv
validators
yagocd==0.4.4
wrapt==1.11.*
yagocd
wrapt
74 changes: 43 additions & 31 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,14 @@ attrs==23.1.0
# via
# jsonlines
# zeep
backoff==1.5.0
backoff==2.2.1
# via -r requirements/base.in
beautifulsoup4==4.12.2
# via cloudflare
boto3==1.20.54
# via
# -c requirements/constraints.txt
# -r requirements/base.in
botocore==1.23.54
boto3==1.28.53
# via -r requirements/base.in
botocore==1.31.53
# via
# -c requirements/constraints.txt
# boto3
# s3transfer
cachetools==5.3.1
Expand Down Expand Up @@ -64,25 +61,32 @@ easydict==1.10
# via yagocd
edx-django-utils==5.7.0
# via edx-rest-api-client
edx-opaque-keys==0.4
edx-opaque-keys==2.5.1
# via -r requirements/base.in
edx-rest-api-client==5.5.0
edx-rest-api-client==5.6.0
# via -r requirements/base.in
freezegun==0.3.8
freezegun==1.2.2
# via -r requirements/base.in
gitdb==4.0.10
# via gitpython
gitpython==3.1.18
# via -r requirements/base.in
google-api-python-client==1.7.3
gitpython==3.1.37
# via -r requirements/base.in
google-api-core==2.12.0
# via google-api-python-client
google-api-python-client==1.12.11
# via
# -c requirements/constraints.txt
# -r requirements/base.in
google-auth==2.23.0
# via
# google-api-core
# google-api-python-client
# google-auth-httplib2
# kubernetes
google-auth-httplib2==0.1.1
# via google-api-python-client
googleapis-common-protos==1.60.0
# via google-api-core
httplib2==0.22.0
# via
# google-api-python-client
Expand All @@ -91,30 +95,40 @@ idna==3.4
# via requests
isodate==0.6.1
# via zeep
jenkinsapi==0.3.3
jenkinsapi==0.3.13
# via -r requirements/base.in
jmespath==0.10.0
jinja2==3.1.2
# via -r requirements/base.in
jmespath==1.0.1
# via
# boto3
# botocore
jsonlines==4.0.0
# via cloudflare
kubernetes==12.0.1
kubernetes==28.1.0
# via -r requirements/base.in
lxml==4.9.3
# via zeep
markupsafe==2.1.3
# via jinja2
more-itertools==10.1.0
# via simple-salesforce
newrelic==9.0.0
# via edx-django-utils
oauthlib==3.2.2
# via requests-oauthlib
# via
# kubernetes
# requests-oauthlib
pbr==5.11.1
# via stevedore
pendulum==2.1.2
# via simple-salesforce
platformdirs==3.10.0
# via zeep
protobuf==4.24.3
# via
# google-api-core
# googleapis-common-protos
psutil==5.9.5
# via edx-django-utils
pyasn1==0.5.0
Expand All @@ -132,7 +146,7 @@ pyjwt[crypto]==2.8.0
# edx-rest-api-client
# pygithub
# simple-salesforce
pymongo==3.5.1
pymongo==3.13.0
# via
# -r requirements/base.in
# edx-opaque-keys
Expand All @@ -148,15 +162,15 @@ python-dateutil==2.8.2
# freezegun
# kubernetes
# pendulum
pytz==2016.10
pytz==2023.3.post1
# via
# -r requirements/base.in
# django
# jenkinsapi
# zeep
pytzdata==2020.1
# via pendulum
pyyaml==5.4
pyyaml==6.0.1
# via
# -r requirements/base.in
# cloudflare
Expand All @@ -166,6 +180,7 @@ requests==2.31.0
# -r requirements/base.in
# cloudflare
# edx-rest-api-client
# google-api-core
# jenkinsapi
# kubernetes
# pygithub
Expand All @@ -185,7 +200,7 @@ requests-toolbelt==1.0.0
# via zeep
rsa==4.9
# via google-auth
s3transfer==0.5.2
s3transfer==0.6.2
# via boto3
sailthru-client==2.3.5
# via -r requirements/base.in
Expand All @@ -196,14 +211,12 @@ simplejson==3.19.1
six==1.16.0
# via
# -r requirements/base.in
# edx-opaque-keys
# freezegun
# google-api-python-client
# isodate
# jenkinsapi
# kubernetes
# python-dateutil
# requests-file
# stevedore
# yagocd
slumber==0.7.1
# via edx-rest-api-client
Expand All @@ -213,12 +226,14 @@ soupsieve==2.5
# via beautifulsoup4
sqlparse==0.4.4
# via django
stevedore==1.32.0
stevedore==5.1.0
# via
# edx-django-utils
# edx-opaque-keys
typing-extensions==4.8.0
# via asgiref
# via
# asgiref
# edx-opaque-keys
unicodecsv==0.14.1
# via -r requirements/base.in
uritemplate==3.0.1
Expand All @@ -233,14 +248,11 @@ validators==0.22.0
# via -r requirements/base.in
websocket-client==1.6.3
# via kubernetes
wrapt==1.11.2
wrapt==1.15.0
# via
# -r requirements/base.in
# deprecated
yagocd==0.4.4
yagocd==1.0.1
# via -r requirements/base.in
zeep==4.2.1
# via simple-salesforce

# The following packages are considered to be unsafe in a requirements file:
# setuptools
5 changes: 3 additions & 2 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@

# TODO: Many pinned dependencies should be unpinned and/or moved to this constraints file.

boto3==1.20.54
botocore>=1.23.54,<1.24.0 #https://github.com/boto/boto3/commit/d226d9db05b4fb9d24b4e090efcc752ace5d4985#diff-67fbd34f176dc812829309d74467869a35bf5af2764b626fc1cfb4656c94c633R21
#boto3==1.20.54
#botocore>=1.23.54,<1.24.0 #https://github.com/boto/boto3/commit/d226d9db05b4fb9d24b4e090efcc752ace5d4985#diff-67fbd34f176dc812829309d74467869a35bf5af2764b626fc1cfb4656c94c633R21
responses<0.21.0
django<4.0
setuptools<60
google-api-python-client<2
2 changes: 1 addition & 1 deletion requirements/testing.in
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ pytest-xdist
pytest-pylint
responses
requests_mock
wrapt==1.11.*
wrapt
21 changes: 9 additions & 12 deletions requirements/testing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,15 @@
#
# make upgrade
#
astroid==2.15.6
astroid==2.15.7
# via
# -r requirements/testing.in
# pylint
# pylint-celery
boto3==1.20.54
# via
# -c requirements/constraints.txt
# moto
botocore==1.23.54
boto3==1.28.53
# via moto
botocore==1.31.53
# via
# -c requirements/constraints.txt
# boto3
# moto
# s3transfer
Expand Down Expand Up @@ -60,7 +57,7 @@ jinja2==3.1.2
# via
# code-annotations
# moto
jmespath==0.10.0
jmespath==1.0.1
# via
# boto3
# botocore
Expand All @@ -74,7 +71,7 @@ mccabe==0.7.0
# via pylint
mock==5.1.0
# via -r requirements/testing.in
moto==4.2.3
moto==4.2.4
# via -r requirements/testing.in
packaging==23.1
# via pytest
Expand All @@ -92,7 +89,7 @@ pycodestyle==2.11.0
# pytest-pycodestyle
pycparser==2.21
# via cffi
pylint==2.17.5
pylint==2.17.6
# via
# -r requirements/testing.in
# edx-lint
Expand Down Expand Up @@ -143,7 +140,7 @@ responses==0.20.0
# -c requirements/constraints.txt
# -r requirements/testing.in
# moto
s3transfer==0.5.2
s3transfer==0.6.2
# via boto3
six==1.16.0
# via
Expand Down Expand Up @@ -174,7 +171,7 @@ urllib3==1.26.16
# responses
werkzeug==2.3.7
# via moto
wrapt==1.11.2
wrapt==1.15.0
# via
# -r requirements/testing.in
# astroid
Expand Down
Loading

0 comments on commit 4f6683f

Please sign in to comment.