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

Added l2tdevtools configuration files and generated dependency files #790

Merged
merged 1 commit into from
Apr 3, 2019

Conversation

joachimmetz
Copy link
Member

@joachimmetz joachimmetz commented Jan 17, 2019

@berggren do not merge this yet, but please check if you're OK with these changes

Depends on #832

@berggren
Copy link
Contributor

Thanks for putting this together! It looks good, but I need to test this PR. I let you know.

Copy link
Contributor

@kiddinn kiddinn left a comment

Choose a reason for hiding this comment

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

Adding few comments to this PR

@joachimmetz
Copy link
Member Author

@kiddinn FYI changing this in dependencies.ini and running l2tdevtools update-dependencies.py will re-generate the files you flagged.

@joachimmetz
Copy link
Member Author

joachimmetz commented Feb 9, 2019

Also pandas seem to have been added

diff --git a/requirements.txt b/requirements.txt
index e594bf5..ccb1d33 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -48,17 +48,16 @@ mccabe==0.6.1             # via pylint
 mock==2.0.0
 neo4jrestclient==2.1.1
 nose==1.3.7
-numpy==1.13.3             # via datasketch
-pandas>=0.23
+numpy==1.13.3             # via datasketch, pandas
+pandas==0.24.1
 parameterized==0.6.1
 pbr==3.1.1                # via mock
 pycparser==2.18           # via cffi
-pycypher==0.5.9
 pyjwt==1.6.4
 pylint==1.7.2
 python-dateutil==2.6.1
 python-editor==1.0.3      # via alembic
-pytz==2017.2              # via celery, flask-restful
+pytz==2017.2              # via celery, flask-restful, pandas
 pyyaml==4.2b4
 redis==2.10.6
 requests==2.20.1

@joachimmetz
Copy link
Member Author

@berggren @kiddinn I see that pandas is used in api_client/python/timesketch_api_client/client.py but this is not used in the timesketch module?

@joachimmetz joachimmetz force-pushed the l2tdevtools branch 2 times, most recently from 3666922 to 79c2c2b Compare February 9, 2019 07:36
@joachimmetz
Copy link
Member Author

sudo add-apt-repository universe
sudo add-apt-repository ppa:gift/stable
./config/linux/gift_ppa_install.sh

@kiddinn
Copy link
Contributor

kiddinn commented Feb 9, 2019

@berggren @kiddinn I see that pandas is used in api_client/python/timesketch_api_client/client.py but this is not used in the timesketch module?

@joachimmetz pandas is also used in the analyzers interface and in the browser timeframe analyzer

Copy link
Contributor

@kiddinn kiddinn left a comment

Choose a reason for hiding this comment

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

few comments

.travis.yml Outdated
- pip install .
- pip install -r requirements.txt
- pip install -r test_requirements.txt
- pip install pandas
Copy link
Contributor

Choose a reason for hiding this comment

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

why have this here, and not in requirements.txt?

Copy link
Member Author

@joachimmetz joachimmetz Feb 9, 2019

Choose a reason for hiding this comment

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

@kiddinn this PR is WIP, I've not added a reviewer yet. The reason why this is here is because of the previous question about pandas.

timesketch.ini Outdated
name: timesketch
name_description: Timesketch
maintainer: Timesketch development team <timesketch-dev@googlegroups.com>
homepage_url: https://github.com/log2timeline/dfdatetime
Copy link
Contributor

Choose a reason for hiding this comment

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

this is not the correct homepage url

Copy link
Member Author

Choose a reason for hiding this comment

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

ack

@joachimmetz
Copy link
Member Author

@kiddinn What is the minimum required version of pandas?

@kiddinn
Copy link
Contributor

kiddinn commented Feb 9, 2019

@kiddinn What is the minimum required version of pandas?

0.24 is the optimal but offline discussions on how far we can go back... that is whether we want to support xenial (Ubuntu), which only has 0.17

@joachimmetz joachimmetz force-pushed the l2tdevtools branch 2 times, most recently from 67104b7 to 2e381ec Compare February 9, 2019 19:21
@joachimmetz
Copy link
Member Author

Xenial support is going to involve updating several more dependencies log2timeline/l2tdevtools#447 so IMHO not a priority.

@joachimmetz
Copy link
Member Author

joachimmetz commented Mar 19, 2019

New dependencies:

Pre 3.6 alternative for typing is https://pypi.org/project/python_version/

@joachimmetz joachimmetz force-pushed the l2tdevtools branch 4 times, most recently from 349db06 to c9d48e5 Compare March 21, 2019 06:23
@joachimmetz
Copy link
Member Author

joachimmetz commented Mar 21, 2019

TODO: address log2timeline/l2tdevtools#642 not blocking

@joachimmetz
Copy link
Member Author

Python 2 requires python-typing https://packages.ubuntu.com/search?keywords=python-typing

@joachimmetz joachimmetz added the Blocked The issue or PR is blocked on another issue label Mar 21, 2019
@joachimmetz joachimmetz force-pushed the l2tdevtools branch 2 times, most recently from aadd39d to 2d1cd64 Compare March 21, 2019 19:34
@joachimmetz
Copy link
Member Author

After updating the pip tests fail, also some warnings in the pip output:

celery 4.2.2 has requirement billiard<3.6.0,>=3.5.0.2, but you'll have billiard 3.6.0.0 which is incompatible.
celery 4.2.2 has requirement kombu<4.4,>=4.2.0, but you'll have kombu 4.4.0 which is incompatible.

@joachimmetz joachimmetz removed the Blocked The issue or PR is blocked on another issue label Mar 24, 2019
@joachimmetz joachimmetz requested review from berggren and kiddinn March 24, 2019 16:12
@joachimmetz
Copy link
Member Author

joachimmetz commented Mar 24, 2019

@berggren @kiddinn this PR is ready for review now.

I've reverted using the auto generated requirements.txt due to #854

@joachimmetz
Copy link
Member Author

@berggren @kiddinn friendly ping

@berggren
Copy link
Contributor

berggren commented Apr 2, 2019

@joachimmetz Ack, taking a look today.

Copy link
Contributor

@kiddinn kiddinn left a comment

Choose a reason for hiding this comment

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

this LGTM, but I'll allow johan to make the final green light

berggren
berggren previously approved these changes Apr 2, 2019
Copy link
Contributor

@berggren berggren left a comment

Choose a reason for hiding this comment

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

LGTM, when thew conflicts (travis/install.sh) is resolved I will merge this.

@joachimmetz
Copy link
Member Author

@berggren merge conflict resolved

Copy link
Contributor

@berggren berggren left a comment

Choose a reason for hiding this comment

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

LGTM

@berggren berggren merged commit 44ee27b into google:master Apr 3, 2019
@joachimmetz joachimmetz deleted the l2tdevtools branch April 3, 2019 21:29
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.

3 participants