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

I1085 data set batch filter concept #1168

Merged
merged 39 commits into from
Oct 26, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
a8ae010
first draft new filter concept
nitsrek Aug 20, 2018
208c506
new filter in dataset.populate + stack.aggregate
nitsrek Aug 20, 2018
97cdce6
checkpoint
nitsrek Oct 8, 2018
d58e68e
gitignore und setup cfg for other pytest version
nitsrek Oct 15, 2018
687a084
Merge branch 'develop' of https://github.com/Quantipy/quantipy into i…
nitsrek Oct 16, 2018
e60985b
add property to filters
nitsrek Oct 17, 2018
dc6a7af
adjustments in extend_filter_var
nitsrek Oct 18, 2018
5c0d0f1
take all cases if included filter logic is empty
nitsrek Oct 18, 2018
7ed61e2
reduce_filter_var
nitsrek Oct 18, 2018
4d90477
checkpoint
nitsrek Oct 18, 2018
f086155
Merge branch 'develop' of https://github.com/Quantipy/quantipy into i…
nitsrek Oct 18, 2018
1e88f79
filter in batch: checkpoint
nitsrek Oct 19, 2018
a04f4e7
filter in batch: checkpoint
nitsrek Oct 19, 2018
ee8f19d
filter in batch: checkpoint
nitsrek Oct 19, 2018
a9418fe
adjust filter recodes in dataset
nitsrek Oct 19, 2018
47b60c1
filter concept in from_batch
nitsrek Oct 19, 2018
ac65e85
Merge branch 'develop' of https://github.com/Quantipy/quantipy into i…
nitsrek Oct 22, 2018
71f5fa9
filter adjustments in stack.add_tests
nitsrek Oct 22, 2018
bff6c9d
typo
nitsrek Oct 22, 2018
b9dcd3d
tests in stack for new filter
nitsrek Oct 22, 2018
87eeeb4
fix dataset.parrot
nitsrek Oct 22, 2018
3138247
typo
nitsrek Oct 22, 2018
6e1d5d2
typo
nitsrek Oct 22, 2018
a7d2c90
adjust raise message
nitsrek Oct 22, 2018
79a61a1
checkpoint
nitsrek Oct 23, 2018
c945127
checkpoint
nitsrek Oct 23, 2018
98610b2
allow overwriting of batch filtersÄ
nitsrek Oct 24, 2018
d59d026
checkpoint
nitsrek Oct 24, 2018
81a97b3
fix ignore renames in batch props for copy
nitsrek Oct 24, 2018
a01210f
remove prints
nitsrek Oct 24, 2018
9bd7761
checkpoint
nitsrek Oct 25, 2018
2f19e58
allow inserting cm by neg values
nitsrek Oct 25, 2018
17fd9b3
dataset compare_filter
nitsrek Oct 25, 2018
d2d3c7b
qp parrot!
nitsrek Oct 25, 2018
eb38691
encoding in filter_names
nitsrek Oct 25, 2018
0fccc19
qp.parrot!
nitsrek Oct 26, 2018
d06fc77
Merge branch 'develop' of https://github.com/Quantipy/quantipy into i…
nitsrek Oct 26, 2018
3938b41
remove file
nitsrek Oct 26, 2018
f23654c
adjust gitignore
nitsrek Oct 26, 2018
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 .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ docs/API/_templates/
*.egg
.eggs/
.cache
.pytest_cache/
*.pytest_cache/

build
161 changes: 0 additions & 161 deletions h

This file was deleted.

2 changes: 2 additions & 0 deletions quantipy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
from quantipy.core.view_generators.view_mapper import ViewMapper
from quantipy.core.view_generators.view_maps import QuantipyViews
from quantipy.core.view_generators.view_specs import (net, calc, ViewManager)
from quantipy.core.helpers.functions import parrot
import quantipy.core.helpers.functions as helpers
import quantipy.core.tools.dp as dp
import quantipy.core.tools.view as v
Expand All @@ -32,3 +33,4 @@
from quantipy.core.builds.powerpoint.pptx_painter import PowerPointPainter

from quantipy.version import version as __version__

Loading