Skip to content

Commit

Permalink
Merge 559fb46 into 501d079
Browse files Browse the repository at this point in the history
  • Loading branch information
mansenfranzen committed Jun 5, 2019
2 parents 501d079 + 559fb46 commit 95317b1
Show file tree
Hide file tree
Showing 35 changed files with 2,115 additions and 62 deletions.
2 changes: 1 addition & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ source = pywrangler

[paths]
source =
src/
# src/
*/site-packages/

[report]
Expand Down
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ env:
- ENV_STRING=pyspark2.4.0
- ENV_STRING=pyspark2.3.1

- ENV_STRING=dask1.1.5


# Remove python/pandas version interactions which do not have wheels on pypi
matrix:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Version 0.1.0

This is the initial release of pywrangler.

- Add benchmark utilities for pandas, spark and dask wranglers (`#5 <https://github.com/mansenfranzen/pywrangler/pull/5>`_).
- Add sequential ``NaiveIterator`` and vectorized ``VectorizedCumSum`` pandas implementations for ``IntervalIdentifier`` wrangler (`#2 <https://github.com/mansenfranzen/pywrangler/pull/2>`_).
- Add ``PandasWrangler`` (`#2 <https://github.com/mansenfranzen/pywrangler/pull/2>`_).
- Add ``IntervalIdentifier`` wrangler interface (`#2 <https://github.com/mansenfranzen/pywrangler/pull/2>`_).
Expand Down
2 changes: 2 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ testing =
pytest
pytest-cov
tox
memory_profiler

dev =
sphinx
Expand All @@ -52,6 +53,7 @@ norecursedirs =
dist
build
.tox

testpaths = tests

[aliases]
Expand Down
2 changes: 0 additions & 2 deletions src/pywrangler/__init__.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# -*- coding: utf-8 -*-
from pkg_resources import get_distribution, DistributionNotFound

try:
# Change here if project is renamed and does not equal the package name
dist_name = __name__
__version__ = get_distribution(dist_name).version
except DistributionNotFound:
Expand Down
Loading

0 comments on commit 95317b1

Please sign in to comment.