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.

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

Switch from pyroute2 to pyroute2.core #239

Merged
merged 1 commit into from
May 25, 2021
Merged

Conversation

cccs-jh
Copy link
Contributor

@cccs-jh cccs-jh commented May 21, 2021

The newest pyroute2 version is split into separate packages. See https://github.com/svinota/pyroute2/discussions/786 and https://github.com/svinota/pyroute2/discussions/796.
Assemblyline only uses IPRoute from pyroute2.core. Currently the pyroute2 and pyroute2-minimal meta packages have import bugs related to not having importlib-metadata installed on python3.7 svinota/pyroute2#797. This is causing an error in Frankenstrings which uses functions in net.py to validate network strings. This is fixed by switching to pyroute2.core which doesn't use importlib-metadata and minimizes our dependencies.

Copy link
Contributor

@cccs-kevin cccs-kevin left a comment

Choose a reason for hiding this comment

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

I'm all for hotfixes but has this been tested in the dev branch?

@codecov-commenter
Copy link

codecov-commenter commented May 21, 2021

Codecov Report

Merging #239 (df00f87) into master (fa50709) will increase coverage by 0.27%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #239      +/-   ##
==========================================
+ Coverage   64.94%   65.22%   +0.27%     
==========================================
  Files         119      119              
  Lines       10412    10412              
==========================================
+ Hits         6762     6791      +29     
+ Misses       3650     3621      -29     
Impacted Files Coverage Δ
assemblyline/common/net.py 34.25% <100.00%> (+27.77%) ⬆️
assemblyline/common/logformat.py 73.33% <0.00%> (-13.34%) ⬇️
assemblyline/common/net_static.py 100.00% <0.00%> (+100.00%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update fa50709...df00f87. Read the comment docs.

@cccs-jh
Copy link
Contributor Author

cccs-jh commented May 21, 2021

I'm all for hotfixes but has this been tested in the dev branch?

This will be merged after #240 is tested

@cccs-rs
Copy link
Contributor

cccs-rs commented May 25, 2021

I'm all for hotfixes but has this been tested in the dev branch?

This will be merged after #240 is tested

I can confirm that Frankenstrings is not erroring in staging with the base in the dev branch. @cccs-jh can you confirm as well?

https://github.com/CybercentreCanada/assemblyline-base/releases/tag/v4.0.1.dev85
https://github.com/CybercentreCanada/assemblyline-v4-service/releases/tag/v4.0.0.dev201
https://github.com/CybercentreCanada/assemblyline-service-frankenstrings/releases/tag/v4.0.0.dev31

@cccs-jh
Copy link
Contributor Author

cccs-jh commented May 25, 2021

I'm all for hotfixes but has this been tested in the dev branch?

This will be merged after #240 is tested

I can confirm that Frankenstrings is not erroring in staging with the base in the dev branch. @cccs-jh can you confirm as well?

Yes, can confirm.

@cccs-jh cccs-jh merged commit 8229622 into master May 25, 2021
@cccs-jh cccs-jh deleted the hotfix/pyroute2_import branch May 25, 2021 15:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants