Fix simple typo: occurence -> occurrence

.binstar.yml

@@ -0,0 +1,17 @@
+package: cytoolz
+platform:
+  - linux-64
+  - linux-32
+  - osx-64
+  - win-64
+  - win-32
+engine:
+  - python=2.6
+  - python=2.7
+  - python=3.3
+  - python=3.4
+script:
+  - conda build conda.recipe
+build_targets:
+  files: conda
+  channels: main

.gitignore

@@ -3,3 +3,6 @@
 *.pyc
 *.swp
 *.so
+*.pyd
+build/
+dist/

.travis.yml

@@ -1,29 +1,29 @@
 language: python
 python:
-    - "2.6"
     - "2.7"
-    - "3.2"
-    - "3.3"
-
-env:
-    - WITH_CYTHON=true
-    - WITH_CYTHON=false
+    - "3.4"
+    - "3.5"
+    - "3.6"
+    - "3.7"
+    - "3.8"
 
 before_install:
     - pip install git+https://github.com/pytoolz/toolz.git
-    - pip install cython
+    - pip install cython pytest
 
 install:
-    # *.c files aren't in the repo, so we must always create them
     - python setup.py build_ext --inplace --with-cython
-    - if [[ $WITH_CYTHON == 'false' ]]; then
-    -     rm cytoolz/*.so
-    -     python setup.py build_ext --inplace --without-cython
-    - fi
 
 # commands to run tests
 script:
     - nosetests --with-doctest cytoolz
+    # For convenience, make sure simple test commands work
+    - py.test
+    - nosetests
+    # Make sure we can cimport cytoolz
+    - echo 'cimport cytoolz ; from cytoolz.functoolz cimport memoize' > try_cimport_cytoolz.pyx
+    - cythonize -i try_cimport_cytoolz.pyx
+    - python -c 'import try_cimport_cytoolz'
 
 notifications:
   email: false

AUTHORS.md

@@ -5,3 +5,9 @@ Erik Welch                                      [@eriknw](https://github.com/eri
 Lars Buitinck                                   [@larsmans](http://github.com/larsmans)
 
 [Thouis (Ray) Jones](http://people.seas.harvard.edu/~thouis)  [@thouis](https://github.com/thouis/)
+
+scoder                                          [@scoder](https://github.com/scoder/)
+
+Phillip Cloud                                   [@cpcloud](https://github.com/cpcloud)
+
+Joe Jevnik                                      [@llllllllll](https://github.com/llllllllll)

MANIFEST.in

@@ -0,0 +1,3 @@
+include LICENSE.txt
+
+include cytoolz/tests/*.py

Makefile

@@ -1,7 +1,34 @@
+SHELL= /bin/bash
 PYTHON ?= python
 
 inplace:
-	$(PYTHON) setup.py build_ext --inplace
+	$(PYTHON) setup.py build_ext --inplace --cython
 
 test: inplace
 	nosetests -s --with-doctest cytoolz/
+	echo 'cimport cytoolz ; from cytoolz.functoolz cimport memoize' > try_cimport_cytoolz.pyx
+	cythonize -i try_cimport_cytoolz.pyx
+	python -c 'import try_cimport_cytoolz'
+	rm try_cimport_cytoolz.*
+
+clean:
+	rm -f cytoolz/*.c cytoolz/*.so cytoolz/*/*.c cytoolz/*/*.so
+	rm -rf build/ cytoolz/__pycache__/ cytoolz/*/__pycache__/
+
+curried:
+	sed -e 's/toolz/cytoolz/g' -e 's/itercytoolz/itertoolz/' \
+		-e 's/dictcytoolz/dicttoolz/g' -e 's/funccytoolz/functoolz/g' \
+		../toolz/toolz/curried/__init__.py > cytoolz/curried/__init__.py
+
+copytests:
+	for f in ../toolz/toolz/tests/test*py; \
+	do \
+		if [[ $$f == *test_utils* ]]; then continue ; fi;  \
+		if [[ $$f == *test_curried_doctests* ]]; then continue ; fi;  \
+		if [[ $$f == *test_tlz* ]]; then continue ; fi;  \
+		newf=`echo $$f | sed 's/...toolz.toolz/cytoolz/g'`; \
+		sed -e 's/toolz/cytoolz/g' -e 's/itercytoolz/itertoolz/' \
+			-e 's/dictcytoolz/dicttoolz/g' -e 's/funccytoolz/functoolz/g' \
+			$$f > $$newf; \
+		echo $$f $$newf; \
+	done

README.rst

@@ -1,7 +1,7 @@
 CyToolz
 =======
 
-|Build Status| |Version Status| |Downloads|
+|Build Status| |Version Status|
 
 Cython implementation of the
 |literal toolz|_ `package, <https://pypi.python.org/pypi/toolz/>`__ which
@@ -20,14 +20,14 @@ usage is achieved by using the iterator protocol and returning iterators
 whenever possible.
 
 ``cytoolz`` implements the same API as ``toolz``.  The main differences are
-that ``cytoolz`` is faster (typically 2-5x faster with a few spectactular
+that ``cytoolz`` is faster (typically 2-5x faster with a few spectacular
 exceptions) and ``cytoolz`` offers a C API that is accessible to other
 projects developed in Cython.  Since ``toolz`` is able to process very
 large (potentially infinite) data sets, the performance increase gained by
 using ``cytoolz`` can be significant.
 
-See the PyToolz documentation at http://toolz.readthedocs.org and the full
-`API Documentation <http://toolz.readthedocs.org/en/latest/api.html>`__
+See the PyToolz documentation at https://toolz.readthedocs.io and the full
+`API Documentation <https://toolz.readthedocs.io/en/latest/api.html>`__
 for more details.
 
 LICENSE
@@ -48,7 +48,7 @@ Install
 Dependencies
 ------------
 
-``cytoolz`` supports Python 2.6+ and Python 3.2+ with a common codebase.
+``cytoolz`` supports Python 2.7+ and Python 3.4+ with a common codebase.
 It is developed in Cython, but requires no dependecies other than CPython
 and a C compiler.  Like ``toolz``, it is a light weight dependency.
 
@@ -66,9 +66,13 @@ Please take a look at our issue pages for
 `cytoolz <https://github.com/pytoolz/cytoolz/issues>`__
 for contribution ideas.
 
-.. |Build Status| image:: https://travis-ci.org/pytoolz/cytoolz.png
+Community
+---------
+
+See our `mailing list <https://groups.google.com/forum/#!forum/pytoolz>`__.
+We're friendly.
+
+.. |Build Status| image:: https://travis-ci.org/pytoolz/cytoolz.svg?branch=master
    :target: https://travis-ci.org/pytoolz/cytoolz
-.. |Version Status| image:: https://pypip.in/v/cytoolz/badge.png
-   :target: https://pypi.python.org/pypi/cytoolz/
-.. |Downloads| image:: https://pypip.in/d/cytoolz/badge.png
-   :target: https://pypi.python.org/pypi/cytoolz/
+.. |Version Status| image:: https://badge.fury.io/py/cytoolz.svg
+   :target: http://badge.fury.io/py/cytoolz

conda.recipe/bld.bat

@@ -0,0 +1,2 @@
+cd %RECIPE_DIR%\..
+%PYTHON% setup.py install

conda.recipe/build.sh

@@ -0,0 +1,2 @@
+cd $RECIPE_DIR/..
+$PYTHON setup.py install

conda.recipe/meta.yaml

@@ -0,0 +1,32 @@
+package:
+    name: cytoolz
+    version: "0.10.0"
+
+build:
+    number: {{environ.get('BINSTAR_BUILD', 1)}}
+
+requirements:
+    build:
+      - setuptools
+      - python
+      - cython
+      - toolz
+      - libpython # [win and not (win64 and py34)]
+
+    run:
+      - python
+      - libpython # [win and not (win64 and py34)]
+
+test:
+    requires:
+      - pytest
+      - nose
+      - toolz
+    imports:
+      - cytoolz
+    commands:
+      - py.test -x --doctest-modules --pyargs cytoolz
+
+about:
+    home: https://toolz.readthedocs.io/
+    license: BSD

cytoolz/__init__.pxd

@@ -2,17 +2,18 @@ from cytoolz.itertoolz cimport (
     accumulate, c_merge_sorted, cons, count, drop, get, groupby, first,
     frequencies, interleave, interpose, isdistinct, isiterable, iterate,
     last, mapcat, nth, partition, partition_all, pluck, reduceby, remove,
-    rest, second, sliding_window, take, take_nth, unique)
+    rest, second, sliding_window, take, tail, take_nth, unique, join,
+    c_diff, topk, peek, random_sample, concat)
 
 
 from cytoolz.functoolz cimport (
-    c_compose, c_juxt, c_memoize, c_pipe, c_thread_first, c_thread_last,
-    complement, curry, do, identity, memoize)
+    c_compose, c_juxt, memoize, c_pipe, c_thread_first, c_thread_last,
+    complement, curry, do, identity, excepts, flip)
 
 
 from cytoolz.dicttoolz cimport (
-    assoc, c_merge, c_merge_with, get_in, keyfilter, keymap, update_in,
-    valfilter, valmap)
+    assoc, c_merge, c_merge_with, c_dissoc, get_in, keyfilter, keymap,
+    itemfilter, itemmap, update_in, valfilter, valmap, assoc_in)
 
 
 from cytoolz.recipes cimport countby, partitionby

cytoolz/__init__.py

@@ -8,13 +8,19 @@
 
 from .compatibility import map, filter
 
-# from . import sandbox
-
 from functools import partial, reduce
 
 sorted = sorted
 
 # Aliases
 comp = compose
 
+# Always-curried functions
+flip = functoolz.flip = curry(functoolz.flip)
+memoize = functoolz.memoize = curry(functoolz.memoize)
+
+from . import curried  # sandbox
+
+functoolz._sigs.update_signature_registry()
+
 from ._version import __version__, __toolz_version__