Merge branch 'master' of github.com:CadQuery/cadquery into docs-update

Author: jmwright

.travis.yml

@@ -58,7 +58,7 @@ before_install:
 - conda env create -f environment.yml
 - source ~/miniconda/bin/activate cadquery
 - conda install -c conda-forge -c defaults -c cadquery python=$PYTHON_VERSION mypy
-- pip install git+https://github.com/CadQuery/OCP-stubs.git
+- pip install git+https://github.com/CadQuery/OCP-stubs.git@7.4.0
 
 install:
 - python setup.py install

cadquery/selectors.py

@@ -191,7 +191,7 @@ def filter(self, objectList: Sequence[Shape]) -> List[Shape]:
 
 
 class ParallelDirSelector(BaseDirSelector):
-    """
+    r"""
     Selects objects parallel with the provided direction.
 
     Applicability:
@@ -677,9 +677,9 @@ def _getVector(self, pr):
             return self.axes[pr.simple_dir]
 
     def filter(self, objectList):
-        """
+        r"""
         selects minimum, maximum, positive or negative values relative to a direction
-        [+\|-\|<\|>\|] \<X\|Y\|Z>
+        ``[+|-|<|>|] <X|Y|Z>``
         """
         return self.mySelector.filter(objectList)
 
@@ -740,7 +740,7 @@ def not_callback(res):
 
 
 class StringSyntaxSelector(Selector):
-    """
+    r"""
     Filter lists objects using a simple string syntax. All of the filters available in the string syntax
     are also available ( usually with more functionality ) through the creation of full-fledged
     selector objects. see :py:class:`Selector` and its subclasses
@@ -776,11 +776,11 @@ class StringSyntaxSelector(Selector):
         :and:
             Logical AND, e.g. >X and >Y
         :or:
-            Logical OR, e.g. |X or |Y
+            Logical OR, e.g. \|X or \|Y
         :not:
             Logical NOT, e.g. not #XY
         :exc(ept):
-            Set difference (equivalent to AND NOT): |X exc >Z
+            Set difference (equivalent to AND NOT): \|X exc >Z
 
     Finally, it is also possible to use even more complex expressions with nesting
     and arbitrary number of terms, e.g.