Merge branch 'master' into rtd-updates

maljovec · Sep 11, 2021 · 62a15c4 · 62a15c4
2 parents dd58596 + 73ccc95
commit 62a15c4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 19 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,13 +4,10 @@ addons:
     - swig
 install: make && pip install coveralls mypy flake8 twine
 python:
-  # - "3.2" # see https://github.com/travis-ci/travis-ci/issues/4866
-  # - "3.3"
-  # - "3.4"
-  # - "3.5"
   - "3.6"
   - "3.7"
-  # - "3.8"
+  - "3.8"
+  - "3.9"
   # - "nightly"
   # PyPy versions commented out since scipy does not play well with pypy
   # - "pypy3.6"

diff --git a/MorseComplex.cpp b/MorseComplex.cpp
@@ -12,7 +12,7 @@
 #include <cmath>
 #include <iterator>
 
-int followChain(int i, std::map<int,int> merge)
+int followChain(int i, std::map<int,int> &merge)
 {
   while(merge[i] != i)
     i = merge[i];

diff --git a/setup.cfg b/setup.cfg
@@ -9,17 +9,5 @@ max-complexity = 15
 [mypy-topopy.topology]
 ignore_errors = True
 
-[mypy-networkx.*]
-ignore_missing_imports = True
-
-[mypy-nglpy.*]
-ignore_missing_imports = True
-
-[mypy-numpy.*]
-ignore_missing_imports = True
-
-[mypy-scipy.*]
-ignore_missing_imports = True
-
-[mypy-sklearn.*]
+[mypy]
 ignore_missing_imports = True