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

0 2 cleanup #228

Merged
merged 47 commits into from
Mar 22, 2017
Merged

0 2 cleanup #228

merged 47 commits into from
Mar 22, 2017

Conversation

narekgharibyan
Copy link
Contributor

@hendrikmuhs
Let's merge the 0.2 code now, and do the release on Monday.

hendrikmuhs and others added 30 commits December 4, 2016 21:20
@hendrikmuhs
remove c-string limit lookup part
7aa8c50
@hendrikmuhs
add zero-byte python test
bbd2928
@hendrikmuhs
Merge pull request #162 from hendrik-cliqz/c-string-limit-lookup-rebase
554f8bb 
C string limit lookup rebase
@hendrikmuhs
Merge branch 'master' of github.com:cliqz/keyvi into 0_2_cleanup-remo…
63946d2 
…ve-deprecated
@hendrikmuhs
Merge pull request #164 from hendrik-cliqz/0_2_cleanup-remove-deprecated
66b56ce 
master to 0_2_cleanup
@hendrikmuhs
remove compact mode from keyvicompiler
ad0f1d7
@hendrikmuhs
rip off deprecated persistence implementation
9dd050e
@hendrikmuhs
remove deprecated json value store implementation
a21056a
@hendrikmuhs
further removal of deprecated code
1a2540c
@hendrikmuhs
Merge pull request #165 from hendrik-cliqz/0_2_cleanup-remove-deprecated
1dda3ed 
0 2 cleanup remove deprecated
@hendrikmuhs
Merge branch 'master' of github.com:cliqz-oss/keyvi into 0_2_cleanup-…
481c4a5 
…rebase-170107
@hendrikmuhs
fix merge issues
c4739a3
@hendrikmuhs
fix merge conflict: remove file
2552fa5
@hendrikmuhs
port test to python3
948f2e2
@hendrikmuhs
Merge pull request #188 from hendrikmuhs/0_2_cleanup-rebase-170107
b6a6f61 
0 2 cleanup rebase 170107
@hendrikmuhs
Merge branch 'master' of github.com:cliqz-oss/keyvi into 0_2_cleanup-…
968c0e0 
…rebase-300107

# Conflicts:
#	pykeyvi/src/pykeyvi.cpp
@hendrikmuhs
Merge branch 'master' of github.com:cliqz-oss/keyvi into 0_2_cleanup-…
c27bc65 
…rebase-300107
Merge pull request #203 from hendrikmuhs/0_2_cleanup-rebase-300107
14eef14 
0 2 cleanup rebase 300107
@hendrikmuhs
separate Int and Completion dictionary type
a7f5b31
@hendrikmuhs
dictionary compiler: move memory limit into parameters
dfccf25
@hendrikmuhs
add option to check what happens when deprecated methods get removed
80fa80d
@hendrikmuhs
finalize completion/int separation
eb1eaa8
@hendrikmuhs
further move the memory_limit parameter into general parameters
2912791 
# Conflicts:
#	keyvi/src/cpp/dictionary/fsa/generator.h
#	pykeyvi/src/pykeyvi.cpp
#	pykeyvi/src/pykeyvi.pyx
#	pykeyvi/tests/dictionary/dictionary_merger_test.py
@hendrikmuhs
implement some utility methods for parameter parsing
0df68f9 
The parameter parser avoids code dups but also adds some convenience functionality.
@hendrikmuhs
fix usage of boost paths
b7545b5
@hendrikmuhs
fix formatting
3da0413
@hendrikmuhs
get better messages from test
e3d9cf5
@hendrikmuhs
rename map_util to config_util
907d085
@hendrikmuhs
rename to configuration, add tests
5cfa9a5
Merge pull request #204 from hendrikmuhs/0_2_cleanup-#172-rebase2
a54643c 
0 2 cleanup #172 rebase2
hendrikmuhs and others added 17 commits February 7, 2017 21:51
@hendrikmuhs
limit memory to 10MB for unit tests
a787983
@hendrikmuhs
configure memory for unit tests, cpp part
7feea27
@hendrikmuhs
enable cpp tests on osx
494169c
@hendrikmuhs
set a higher memory limit to not run out of file handles on OSX
b0406ad
@hendrikmuhs
no map populate tests on OSX, as OSX doesn't support map populate
d6135ac
Merge pull request #207 from cliqz-oss/master
e0e2adc 
merge with master
@hendrikmuhs
reduce file handles for OSX
9d92122
Merge pull request #208 from hendrikmuhs/0_2_cleanup-memory-limit-tests
712fb05 
0 2 cleanup memory limit tests
Fix missing file regression in IntDictionaryCompiler
54d3b5c 
PR #204 missed a file for IntDictionaryCompiler cython additions, this fixes it as well as adds a test.
@narekgharibyan
Merge branch 'master' into 0_2_cleanup
a748d79 
# Conflicts:
#	keyvi/SConstruct
#	travis/build_osx_package.sh
@narekgharibyan
- in 0.2 version memory limit is specified in parameters list
118643f
@narekgharibyan
Merge pull request #221 from narekgharibyan/0_2_cleanup
d9de2d3 
keyvi cli params fix for 0.2 branch
@narekgharibyan
Merge branch 'master' into 0_2_cleanup
c1f90d9
@narekgharibyan
Merge branch 'master' into 0_2_cleanup
b19686a 
# Conflicts:
#	keyvi/src/cpp/dictionary/dictionary_compiler.h
#	keyvi/src/cpp/dictionary/dictionary_merger.h
#	keyvi/tests/cpp/dictionary/dictionary_merger_test.cpp
#	pykeyvi/src/pxds/dictionary_compiler.pxd
@narekgharibyan
- added typedef for IntDictionaryMerger
a9fe162 
 - fixed merger test cases
@narekgharibyan
- fixing formatting
388d0c7
Merge pull request #227 from narekgharibyan/0_2_cleanup
11d4a0e 
latest master changes
@coveralls
Copy link

Coverage Status

Coverage increased (+1.5%) to 88.215% when pulling 11d4a0e on 0_2_cleanup into d66009c on master.

@hendrikmuhs hendrikmuhs merged commit fd97ae5 into master Mar 22, 2017
@hendrikmuhs
Copy link
Contributor

@narekgharibyan

Thanks, I will delete the 0_2_cleanup branch after release.

@narekgharibyan narekgharibyan deleted the 0_2_cleanup branch January 19, 2018 09:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@narekgharibyan @coveralls @hendrikmuhs