Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump yelp-clog and scribereader #3868

Merged
merged 2 commits into from
May 21, 2024
Merged

Bump yelp-clog and scribereader #3868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76e91ae
Bump yelp-clog and scribereader
yaroliakh May 15, 2024
d07c482
Yelpy deps cleanup and extra pins
yaroliakh May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion paasta_tools/check_oom_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

try:
from scribereader import scribereader
from clog.readers import StreamTailerSetupError
from scribereader.clog.readers import StreamTailerSetupError
except ImportError:
scribereader = None

Expand Down
67 changes: 33 additions & 34 deletions yelp_package/extra_requirements_yelp.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,39 @@
atomicfile==1.0
cached-property==1.3.1
cffi==1.15.0
cffi==1.15.0
atomicfile==1.0 # vault-tools dependency
cached-property==1.3.1 # slo-transcoder dependency
cffi==1.15.0 # vault-tools dependency
clusterman_metrics==2.2.0
crypto-lib==4.0.0
cryptography==3.0
dateglob==0.3
geogrid==1.3.5
gitdb2==2.0.3
gitpython==2.1.9
hvac==0.11.0
inflection==0.3.1
iso8601==0.1.14
markdown==2.4
monk==1.3.0
mrjob==0.7.4
named-decorator==0.1.4
ndg-httpsclient==0.4.3
pycparser==2.20
pygpgme==0.3
pyopenssl==19.0.0
PySubnetTree==0.34
python-jsonschema-objects==0.3.1
retrying==1.3.3
scribereader==0.15.0
signalform-tools==0.0.16
crypto-lib==4.0.0 # vault-tools dependency
cryptography==3.0 # vault-tools dependency
dateglob==0.3 # scribereader dependency
geogrid==1.3.5 # scribereader dependency
gitdb2==2.0.3 # slo-transcoder dependency
gitpython==2.1.9 # slo-transcoder, vault-tools dependency
hvac==0.11.0 # vault-tools dependency
inflection==0.3.1 # slo-transcoder dependency
iso8601==2.1.0 # yelp-ips dependency
markdown==2.4 # slo-transcoder dependency
monk==1.3.0 # yelp-clog dependency
mrjob==0.7.4 # scribereader dependency
named-decorator==0.1.4 # yelp-profiling dependency
ndg-httpsclient==0.4.3 # vault-tools dependency
pycparser==2.20 # vault-tools dependency
pygpgme==0.3 # vault-tools dependency
pyopenssl==19.0.0 # vault-tools dependency
PySubnetTree==0.34 # yelp-lib dependency
python-jsonschema-objects==0.3.1 # slo-transcoder dependency
scribereader==1.1.1
signalform-tools==0.0.16 # slo-transcoder dependency
slo-transcoder==3.3.0
smmap2==2.0.3
splunk-sdk==1.7.0
srv-configs==1.1.0
smmap2==2.0.3 # slo-transcoder, vault-tools dependency
splunk-sdk==1.7.0 # sticht dependency
srv-configs==1.1.0 # yelp-profiling dependency
sticht[yelp_internal]==1.1.18
tenacity==8.3.0 # yelp-clog dependency
vault-tools==0.9.2
yelp-cgeom==1.3.1
yelp-clog==5.2.3
yelp-ips==1.0.5
yelp-lib==17.1.0
yelp-logging==1.0.37
yelp-cgeom==1.3.1 # scribereader dependency
yelp-clog==7.1.1
yelp-ips==1.1.1 # yelp-profiling dependency
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think we'll want to add tenacity as well since that's now required by yelp-clog

(figuring this out was kinda annoying: i added the direct dependencies (i.e., things we import) into requirements-minimal.txt and copied the contents here to requirements.txt so that i could run check-requirements)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there's also some lines we can delete: https://fluffy.yelpcorp.com/i/wmSXXqXBvW1THmZPs5mfNGfF2cR9l69g.html is what i think we'd want as a final state

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So I've pinned deps and ran check-requirements for the following main dependencies:

yelp-clog
scribereader
clusterman-metrics
vault-tools
slo-transcoder
yelp-profiling
sticht[yelp_internal]==1.1.18

Not sure about deleting other deps, as I can see most of them being referenced in code

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh good catch - i somehow missed grepping for clusterman-metrics (which is maybe why my check-requirements said we could delete some deps)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also: big thank you for annotating these dependencies :)

yelp-lib==17.1.2 # yelp-ips dependency
yelp-logging==1.0.37 # scribereader dependency
yelp_meteorite==2.1.3
yelp_profiling==9.1.1
Loading