Merge pull request #44 from skirpichev/normalize-eol

Normalize line endings + misc changes
HPAC · Nov 30, 2018 · dcd4e70 · dcd4e70
2 parents 018c4e3 + bf1f438
commit dcd4e70
Show file tree

Hide file tree

Showing 44 changed files with 4,175 additions and 4,158 deletions.
diff --git a/.coveragerc b/.coveragerc
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,5 @@
+*     text=auto
+*.py  text
+*.rst text
+*.cfg text
+*.yml text
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,21 @@
 language: python
+dist: xenial
 python:
   - 3.6
-  - 3.7-dev
+  - 3.7
+stages:
+  - quality
+  - test
+matrix:
+  include:
+    - stage: quality
+      python: 3.6
+      script:
+        - make check
 install:
-  - pip install .[tests,develop]
+  - make init
 script:
+  - make doctest
   - make coverage
 after_success:
   coveralls
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 init:
-	pip install -r requirements.txt
+	pip install .[tests,develop]
 
 test:
 	py.test tests/ --doctest-modules matchpy/ README.rst docs/example.rst
@@ -8,6 +8,9 @@ doctest:
 	py.test --doctest-modules -k "not tests" matchpy/ README.rst docs/example.rst
 
 check:
+	flake8
+
+lint:
 	pylint matchpy
 
 coverage:

diff --git a/conftest.py b/conftest.py
@@ -1,21 +1,21 @@
-# -*- coding: utf-8 -*-
-import pytest
-
-from matchpy.expressions.expressions import Operation, Symbol, Arity, Wildcard, make_dot_variable, make_star_variable, make_plus_variable
-import matchpy
-
-@pytest.fixture(autouse=True)
-def add_default_expressions(doctest_namespace):
-    doctest_namespace['f'] = Operation.new('f', Arity.variadic)
-    doctest_namespace['a'] = Symbol('a')
-    doctest_namespace['b'] = Symbol('b')
-    doctest_namespace['c'] = Symbol('c')
-    doctest_namespace['x_'] = make_dot_variable('x')
-    doctest_namespace['y_'] = make_dot_variable('y')
-    doctest_namespace['_'] = Wildcard.dot()
-    doctest_namespace['__'] = Wildcard.plus()
-    doctest_namespace['___'] = Wildcard.star()
-    doctest_namespace['__name__'] = '__main__'
-
-    for name in matchpy.__all__:
-        doctest_namespace[name] = getattr(matchpy, name)
+# -*- coding: utf-8 -*-
+import pytest
+
+from matchpy.expressions.expressions import Operation, Symbol, Arity, Wildcard, make_dot_variable, make_star_variable, make_plus_variable
+import matchpy
+
+@pytest.fixture(autouse=True)
+def add_default_expressions(doctest_namespace):
+    doctest_namespace['f'] = Operation.new('f', Arity.variadic)
+    doctest_namespace['a'] = Symbol('a')
+    doctest_namespace['b'] = Symbol('b')
+    doctest_namespace['c'] = Symbol('c')
+    doctest_namespace['x_'] = make_dot_variable('x')
+    doctest_namespace['y_'] = make_dot_variable('y')
+    doctest_namespace['_'] = Wildcard.dot()
+    doctest_namespace['__'] = Wildcard.plus()
+    doctest_namespace['___'] = Wildcard.star()
+    doctest_namespace['__name__'] = '__main__'
+
+    for name in matchpy.__all__:
+        doctest_namespace[name] = getattr(matchpy, name)
diff --git a/docs/api/matchpy.expressions.constraints.rst b/docs/api/matchpy.expressions.constraints.rst
@@ -1,7 +1,7 @@
-matchpy.expressions.constraints module
-======================================
-
-.. automodule:: matchpy.expressions.constraints
-    :members:
-    :undoc-members:
-    :show-inheritance:
+matchpy.expressions.constraints module
+======================================
+
+.. automodule:: matchpy.expressions.constraints
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/matchpy.expressions.expressions.rst b/docs/api/matchpy.expressions.expressions.rst
@@ -1,7 +1,7 @@
-matchpy.expressions.expressions module
-======================================
-
-.. automodule:: matchpy.expressions.expressions
-    :members:
-    :undoc-members:
-    :show-inheritance:
+matchpy.expressions.expressions module
+======================================
+
+.. automodule:: matchpy.expressions.expressions
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/matchpy.expressions.functions.rst b/docs/api/matchpy.expressions.functions.rst
@@ -1,7 +1,7 @@
-matchpy.expressions.functions module
-====================================
-
-.. automodule:: matchpy.expressions.functions
-    :members:
-    :undoc-members:
-    :show-inheritance:
+matchpy.expressions.functions module
+====================================
+
+.. automodule:: matchpy.expressions.functions
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/matchpy.expressions.rst b/docs/api/matchpy.expressions.rst
@@ -1,12 +1,12 @@
-matchpy.expressions package
-===========================
-
-Submodules
-----------
-
-.. toctree::
-
-   matchpy.expressions.constraints
-   matchpy.expressions.expressions
-   matchpy.expressions.functions
-   matchpy.expressions.substitution
+matchpy.expressions package
+===========================
+
+Submodules
+----------
+
+.. toctree::
+
+   matchpy.expressions.constraints
+   matchpy.expressions.expressions
+   matchpy.expressions.functions
+   matchpy.expressions.substitution
diff --git a/docs/api/matchpy.expressions.substitution.rst b/docs/api/matchpy.expressions.substitution.rst
@@ -1,7 +1,7 @@
-matchpy.expressions.substitution module
-=======================================
-
-.. automodule:: matchpy.expressions.substitution
-    :members:
-    :undoc-members:
-    :show-inheritance:
+matchpy.expressions.substitution module
+=======================================
+
+.. automodule:: matchpy.expressions.substitution
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/matchpy.functions.rst b/docs/api/matchpy.functions.rst
@@ -1,7 +1,7 @@
-matchpy.functions module
-========================
-
-.. automodule:: matchpy.functions
-    :members:
-    :undoc-members:
-    :show-inheritance:
+matchpy.functions module
+========================
+
+.. automodule:: matchpy.functions
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/matchpy.matching.bipartite.rst b/docs/api/matchpy.matching.bipartite.rst
@@ -1,7 +1,7 @@
-matchpy.matching.bipartite module
-=================================
-
-.. automodule:: matchpy.matching.bipartite
-    :members:
-    :undoc-members:
-    :show-inheritance:
+matchpy.matching.bipartite module
+=================================
+
+.. automodule:: matchpy.matching.bipartite
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/matchpy.matching.many_to_one.rst b/docs/api/matchpy.matching.many_to_one.rst
@@ -1,7 +1,7 @@
-matchpy.matching.many_to_one module
-===================================
-
-.. automodule:: matchpy.matching.many_to_one
-    :members:
-    :undoc-members:
-    :show-inheritance:
+matchpy.matching.many_to_one module
+===================================
+
+.. automodule:: matchpy.matching.many_to_one
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/matchpy.matching.one_to_one.rst b/docs/api/matchpy.matching.one_to_one.rst
@@ -1,7 +1,7 @@
-matchpy.matching.one_to_one module
-==================================
-
-.. automodule:: matchpy.matching.one_to_one
-    :members:
-    :undoc-members:
-    :show-inheritance:
+matchpy.matching.one_to_one module
+==================================
+
+.. automodule:: matchpy.matching.one_to_one
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/matchpy.matching.rst b/docs/api/matchpy.matching.rst
@@ -1,12 +1,12 @@
-matchpy.matching package
-========================
-
-Submodules
-----------
-
-.. toctree::
-
-   matchpy.matching.bipartite
-   matchpy.matching.many_to_one
-   matchpy.matching.one_to_one
+matchpy.matching package
+========================
+
+Submodules
+----------
+
+.. toctree::
+
+   matchpy.matching.bipartite
+   matchpy.matching.many_to_one
+   matchpy.matching.one_to_one
    matchpy.matching.syntactic
diff --git a/docs/api/matchpy.matching.syntactic.rst b/docs/api/matchpy.matching.syntactic.rst
@@ -1,7 +1,7 @@
-matchpy.matching.syntactic module
-=================================
-
-.. automodule:: matchpy.matching.syntactic
-    :members:
-    :undoc-members:
-    :show-inheritance:
+matchpy.matching.syntactic module
+=================================
+
+.. automodule:: matchpy.matching.syntactic
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/matchpy.rst b/docs/api/matchpy.rst
@@ -1,18 +1,18 @@
-matchpy package
-===============
-
-Subpackages
------------
-
-.. toctree::
-
-    matchpy.expressions
-    matchpy.matching
-
-Submodules
-----------
-
-.. toctree::
-
-   matchpy.functions
-   matchpy.utils
+matchpy package
+===============
+
+Subpackages
+-----------
+
+.. toctree::
+
+    matchpy.expressions
+    matchpy.matching
+
+Submodules
+----------
+
+.. toctree::
+
+   matchpy.functions
+   matchpy.utils
diff --git a/docs/api/matchpy.utils.rst b/docs/api/matchpy.utils.rst
@@ -1,7 +1,7 @@
-matchpy.utils module
-====================
-
-.. automodule:: matchpy.utils
-    :members:
-    :undoc-members:
-    :show-inheritance:
+matchpy.utils module
+====================
+
+.. automodule:: matchpy.utils
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/conf.py b/docs/conf.py
@@ -357,4 +357,4 @@ def skip(app, what, name, obj, skip, options):
     return skip
 
 def setup(app):
-    app.connect("autodoc-skip-member", skip)
+    app.connect("autodoc-skip-member", skip)