Merge branch 'master' into logical_and_or

Author: smarie

.travis.yml

@@ -58,6 +58,7 @@ after_success:
   - pylint mini_lambda  # note that at the moment the report is simply lost, we dont transform the result into anything
 # ***documentation***
   - mkdocs build -f docs/mkdocs.yml
+  - if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then exit 0; fi;
   - mv reports/junit site/
   # mkdocs gh-deploy requires special care :
   # ---grant the possibility to push on the repo---
@@ -71,7 +72,7 @@ after_success:
   - git fetch gh-remote && git fetch gh-remote gh-pages:gh-pages;
   # push but only if this is not a build triggered by a pull request
   # note: here we use the --dirty flag so that mkdocs does not clean the additional reports that we copied in the site
-  - if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_PYTHON_VERSION}" = "3.5" ]; then echo "Pushing to github"; PYTHONPATH=mini_lambda/ mkdocs gh-deploy -v --dirty -f docs/mkdocs.yml --remote-name gh-remote; git push gh-remote gh-pages; fi;
+  - if [ "${TRAVIS_PYTHON_VERSION}" = "3.5" ]; then echo "Pushing to github"; PYTHONPATH=mini_lambda/ mkdocs gh-deploy -v --dirty -f docs/mkdocs.yml --remote-name gh-remote; git push gh-remote gh-pages; fi;
 #  - if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_PYTHON_VERSION}" = "3.5" ]; then echo "Pushing to github"; git push gh-remote gh-pages; fi;
 
 deploy:

docs/usage.md

@@ -25,8 +25,8 @@ For convenience, `mini_lambda` comes bundled with the following predefined input
  * boolean/int/float numbers: `b` / `i`, `j`, `n` / `x`, `y`
  * lists/mappings: `l` / `d`
  * callables: `f`
- * numpy arrays (if numpy is present): `X`, `Y`, `M`
- * pandas dataframes (if pandas is present): `df`
+ * numpy arrays (if numpy is present): `X`, `Y`, `M` (from `mini_lambda.numpy`)
+ * pandas dataframes (if pandas is present): `df` (from `mini_lambda.pandas`)
 
 
 ## Lambda Expressions vs Lambda Functions
@@ -345,7 +345,8 @@ Note: although the above is valid, it is much more recommended to convert the wh
 Classes can be entirely made lambda-friendly at once. This will convert the constructor, as well as any other method that would be available.
 
 ```python
-from mini_lambda import X, _, make_lambda_friendly_class
+from mini_lambda import _, make_lambda_friendly_class
+from mini_lambda.numpy import X
 import numpy as np
 import pandas as pd
 
@@ -361,7 +362,8 @@ str(expr)               # 'DataFrame(X).max().values[0]'
 Actually the `Constant()` (alias `C()` or `make_lambda_friendly()`) function that we saw above to convert constants, is also able to convert methods ans classes. So if there is only a single conversion operator to remember, remember this one.
 
 ```python
-from mini_lambda import _, C, X
+from mini_lambda import _, C
+from mini_lambda.numpy import X
 import numpy as np
 import pandas as pd
 

mini_lambda/goodies.py

@@ -20,19 +20,3 @@
 
 # callables
 f = InputVar('f', Callable)
-
-try:
-    import numpy as np
-    # matrices/arrays
-    X = InputVar('X', np.ndarray)
-    Y = InputVar('Y', np.ndarray)
-    M = InputVar('M', np.ndarray)
-except:
-    pass
-
-try:
-    # data frames
-    import pandas as pd
-    df = InputVar('df', pd.DataFrame)
-except:
-    pass

mini_lambda/main.py

@@ -439,7 +439,7 @@ def And(a, b):
 
     :param a: left operand
     :param b: right operand
-    :return: expression evaluation 'and'
+    :return: expression evaluating the and combination
     """
     return _LambdaExpression._get_expression_for_method_with_args(_and, a, b)
 
@@ -454,7 +454,7 @@ def Or(a, b):
 
     :param a: left operand
     :param b: right operand
-    :return: expression evaluation 'or'
+    :return: expression evaluating the or combination
     """
     return _LambdaExpression._get_expression_for_method_with_args(_or, a, b)
 

mini_lambda/numpy.py

@@ -0,0 +1,9 @@
+import numpy as np
+
+from mini_lambda.main import InputVar
+
+
+# matrices/arrays
+X = InputVar('X', np.ndarray)
+Y = InputVar('Y', np.ndarray)
+M = InputVar('M', np.ndarray)

mini_lambda/pandas.py

@@ -0,0 +1,7 @@
+import pandas as pd
+
+from mini_lambda.main import InputVar
+
+
+# data frames
+df = InputVar('df', pd.DataFrame)

mini_lambda/tests/test_readme.py

@@ -303,7 +303,8 @@ def bar2(cls, times, num, den):
 
 def test_doc_usage_other_classes():
     """ Tests that the example in doc/usage in the others/classes section works """
-    from mini_lambda import X, _, make_lambda_friendly_class
+    from mini_lambda import _, make_lambda_friendly_class
+    from mini_lambda.numpy import X
     import numpy as np
     import pandas as pd
 
@@ -316,7 +317,8 @@ def test_doc_usage_other_classes():
 
 def test_doc_usage_all_at_once():
     """ Tests that the example in doc/usage in the others/anything section works """
-    from mini_lambda import _, C, X
+    from mini_lambda import _, C
+    from mini_lambda.numpy import X
     import numpy as np
     import pandas as pd