Merge pull request #46 from s-weigand/fix-problems-with-winpy32

Fix problems with winpy32

.editorconfig

@@ -7,23 +7,27 @@ root = true
 [*]
 end_of_line = lf
 insert_final_newline = true
-
-# Matches multiple files with brace expansion notation
-# Set default charset
-[*.{js,py}]
 charset = utf-8
 
+
 # 4 space indentation
 [*.py]
 indent_style = space
 indent_size = 4
 
+[.gitattributes]
+indent_style = tab
+
+[*.{yml,json,md,ini}]
+indent_size = 2
+
 # Tab indentation (no size specified)
 [Makefile]
 indent_style = tab
 
 # Windows-style newlines
 [*.bat]
+indent_style = tab
 end_of_line = crlf
 
 # Indentation override for all JS under lib directory

constraints.txt

@@ -0,0 +1 @@
+pywin32!=226

docs/refresh_symlinks_windows.sh

@@ -3,5 +3,4 @@
 # Run this in gitbash with administrator rights, if you are on windows
 # and the docs won't build properly.
 export MSYS=winsymlinks:nativestrict
-rm readme.md
-ln -s ../README.md readme.md
+ln -srf ../README.md readme.md

tox.ini

@@ -10,23 +10,26 @@ max-line-length = 99
 [testenv:docs]
 whitelist_externals = make
 commands =
-    make --directory=docs clean html
+  make --directory=docs clean html
 
 [testenv:docs-links]
 whitelist_externals = make
 commands =
-    make --directory=docs clean linkcheck
+  make --directory=docs clean linkcheck
 
 
 [testenv:flake8-nb]
 basepython=python
-deps=flake8-nb
+skip_install=true
+commands_pre =
+  {envpython} -m pip install -U -q -c {toxinidir}/constraints.txt flake8-nb
 commands=flake8_nb material
 
 
 [testenv]
+install_command=python -m pip install -c {toxinidir}/constraints.txt {opts} {packages}
 commands_pre =
-    {envpython} -m pip install -U pip
-    {envpython} -m pip install -U -q -r {toxinidir}/requirements_dev.txt
+  {envpython} -m pip install -U  -c {toxinidir}/constraints.txt pip
+  {envpython} -m pip install -U -q -c {toxinidir}/constraints.txt -r {toxinidir}/requirements_dev.txt
 commands =
-    pytest --nbval --current-env
+  pytest --nbval --current-env