Skip to content

Commit

Permalink
made requirements after the merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
RynhardPietersen committed Feb 22, 2022
1 parent e3f27b4 commit 6f88d64
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 17 deletions.
8 changes: 4 additions & 4 deletions requirements/dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -684,9 +684,9 @@ xmlsec==1.3.11
# via python3-saml
yapf==0.31.0
# via -r dev-requirements.in
zope.event==4.5.0
zope-event==4.5.0
# via gevent
zope.interface==5.4.0
zope-interface==5.4.0
# via gevent

# The following packages are considered to be unsafe in a requirements file:
Expand All @@ -702,5 +702,5 @@ setuptools==50.3.0
# pip-tools
# python-termstyle
# sphinx
# zope.event
# zope.interface
# zope-event
# zope-interface
8 changes: 4 additions & 4 deletions requirements/docs-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -543,9 +543,9 @@ xlrd==2.0.1
# via -r base-requirements.in
xlwt==1.3.0
# via -r base-requirements.in
zope.event==4.5.0
zope-event==4.5.0
# via gevent
zope.interface==5.4.0
zope-interface==5.4.0
# via gevent

# The following packages are considered to be unsafe in a requirements file:
Expand All @@ -556,5 +556,5 @@ setuptools==53.0.0
# gunicorn
# jsonschema
# sphinx
# zope.event
# zope.interface
# zope-event
# zope-interface
9 changes: 6 additions & 3 deletions requirements/prod-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,10 @@ prometheus-client==0.7.1
prompt-toolkit==3.0.26
# via ipython
protobuf==3.15.0
# via ddtrace
# via
# ddtrace
# google-api-core
# googleapis-common-protos
psycogreen==1.0.2
# via -r base-requirements.in
psycopg2==2.8.6
Expand Down Expand Up @@ -567,9 +570,9 @@ xlwt==1.3.0
# via -r base-requirements.in
xmlsec==1.3.11
# via python3-saml
zope.event==4.5.0
zope-event==4.5.0
# via gevent
zope.interface==5.4.0
zope-interface==5.4.0
# via gevent

# The following packages are considered to be unsafe in a requirements file:
Expand Down
9 changes: 6 additions & 3 deletions requirements/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,10 @@ polib==1.1.0
prometheus-client==0.7.1
# via -r base-requirements.in
protobuf==3.15.0
# via ddtrace
# via
# ddtrace
# google-api-core
# googleapis-common-protos
psycogreen==1.0.2
# via -r base-requirements.in
psycopg2==2.8.6
Expand Down Expand Up @@ -494,9 +497,9 @@ xlwt==1.3.0
# via -r base-requirements.in
xmlsec==1.3.11
# via python3-saml
zope.event==4.5.0
zope-event==4.5.0
# via gevent
zope.interface==5.4.0
zope-interface==5.4.0
# via gevent

# The following packages are considered to be unsafe in a requirements file:
Expand Down
9 changes: 6 additions & 3 deletions requirements/test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,10 @@ polib==1.1.0
prometheus-client==0.7.1
# via -r base-requirements.in
protobuf==3.15.0
# via ddtrace
# via
# ddtrace
# google-api-core
# googleapis-common-protos
psycogreen==1.0.2
# via -r base-requirements.in
psycopg2==2.8.6
Expand Down Expand Up @@ -547,9 +550,9 @@ xlwt==1.3.0
# via -r base-requirements.in
xmlsec==1.3.11
# via python3-saml
zope.event==4.5.0
zope-event==4.5.0
# via gevent
zope.interface==5.4.0
zope-interface==5.4.0
# via gevent

# The following packages are considered to be unsafe in a requirements file:
Expand Down

0 comments on commit 6f88d64

Please sign in to comment.