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

Issue/140 show version number #153

Merged
merged 2 commits into from Mar 30, 2020
Merged

Issue/140 show version number #153

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
33fdc02
import private variables correctly
mesejo Mar 28, 2020
2134f53
ignore whitespace by using ellipsis, update noxfile accordingly, run …
mesejo Mar 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 10 additions & 1 deletion eland/__init__.py
View file
Open in desktop
Expand Up @@ -14,7 +14,16 @@

# flake8: noqa

from eland._version import *
from eland._version import (
__title__,
__description__,
Copy link
Contributor

Choose a reason for hiding this comment

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

Looking over this change, I actually much prefer it when the imports are listed out like in the lines above instead of just using the asterisk - it makes it easier to find where things are defined (imho). @sethmlarson is it common practice to do asterisk imports in init.py? I guess it saves some typing, but I've always generally had the feel that asterisk imports in general were frowned upon.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah star imports are not optimal, makes it hard for tooling to figure out the true signature of objects being used without searching everywhere. I actually have a flake warning suppressed due to this but I'm saving the fix until we narrow our public API so there's no rework to do. :)

__url__,
__version__,
__author__,
__author_email__,
__maintainer__,
__maintainer_email__,
)
from eland.common import *
from eland.client import *
from eland.filter import *
Expand Down
26 changes: 13 additions & 13 deletions eland/dataframe.py
View file
Open in desktop
Expand Up @@ -250,18 +250,18 @@ def tail(self, n=5):
>>> df = ed.DataFrame('localhost', 'flights', columns=['Origin', 'Dest'])
>>> df.tail()
Origin \\
13054 Pisa International Airport
13055 Winnipeg / James Armstrong Richardson International Airport
13056 Licenciado Benito Juarez International Airport
13057 Itami Airport
13058 Adelaide International Airport
13054 Pisa International Airport...
13055 Winnipeg / James Armstrong Richardson International Airport...
13056 Licenciado Benito Juarez International Airport...
13057 Itami Airport...
13058 Adelaide International Airport...
<BLANKLINE>
Dest
13054 Xi'an Xianyang International Airport
13055 Zurich Airport
13056 Ukrainka Air Base
13057 Ministro Pistarini International Airport
13058 Washington Dulles International Airport
Dest...
13054 Xi'an Xianyang International Airport...
13055 Zurich Airport...
13056 Ukrainka Air Base...
13057 Ministro Pistarini International Airport...
13058 Washington Dulles International Airport...
<BLANKLINE>
[5 rows x 2 columns]
"""
Expand Down Expand Up @@ -609,8 +609,8 @@ def info(
<class 'eland.dataframe.DataFrame'>
Index: 4675 entries, 0 to 4674
Data columns (total 2 columns):
# Column Non-Null Count Dtype
--- ------ -------------- -----
# Column Non-Null Count Dtype...
--- ------ -------------- -----...
0 customer_first_name 4675 non-null object
1 geoip.city_name 4094 non-null object
dtypes: object(2)
Expand Down
2 changes: 1 addition & 1 deletion noxfile.py
View file
Open in desktop
Expand Up @@ -20,7 +20,7 @@ def blacken(session):
def lint(session):
session.install("black", "flake8")
session.run("black", "--check", "--target-version=py36", *SOURCE_FILES)
session.run("flake8", "--ignore=W291,E501,W503,E402,E712", *SOURCE_FILES)
session.run("flake8", "--ignore=E501,W503,E402,E712", *SOURCE_FILES)


@nox.session(python=["3.6", "3.7", "3.8"])
Expand Down