Merge pull request #12 from ulf1/dev

Fixes

Author: ulf1

.github/workflows/syntax-and-unit-tests.yml

@@ -7,16 +7,23 @@ jobs:
 
     runs-on: ubuntu-18.04
 
+    strategy:
+      matrix:
+        python-version: ['3.6', '3.7', '3.8', '3.x']
+    
+    name: Python ${{ matrix.python-version }} Tests
+
     steps:
     - uses: actions/checkout@v1
-    - name: Set up Python 3.6
+    - name: Setup python
       uses: actions/setup-python@v1
       with:
-        python-version: 3.6
+        python-version: ${{ matrix.python-version }}
+        architecture: x64
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip3 install -r requirements-dev.txt
+        pip install -r requirements-dev.txt
     - name: Lint with flake8
       run: |
         flake8 --ignore=F401 --exclude=$(grep -v '^#' .gitignore | xargs | sed -e 's/ /,/g')

.gitignore

@@ -108,3 +108,4 @@ venv.bak/
 .vscode
 profile/data*
 .theia
+README.rst

CHANGES.md

@@ -1,3 +1,8 @@
+# 0.4.2 / 2020-04-23
+
+  * Test multiple python versions
+  * Installation problems: zip_true set to False because file import required
+
 # 0.4.0 / 2020-12-18
 
   * License changed to Apache-2

MANIFEST.in

@@ -1,2 +1,3 @@
 include README.md
+include README.rst
 recursive-include test *.py

README.md

@@ -1,6 +1,9 @@
 [![PyPI version](https://badge.fury.io/py/sparsity-pattern.svg)](https://badge.fury.io/py/sparsity-pattern)
 [![DOI](https://zenodo.org/badge/245850728.svg)](https://zenodo.org/badge/latestdoi/245850728)
-
+[![sparsity-pattern](https://snyk.io/advisor/python/sparsity-pattern/badge.svg)](https://snyk.io/advisor/python/sparsity-pattern)
+[![Total alerts](https://img.shields.io/lgtm/alerts/g/ulf1/sparsity-pattern.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/ulf1/sparsity-pattern/alerts/)
+[![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/ulf1/sparsity-pattern.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/ulf1/sparsity-pattern/context:python)
+[![deepcode](https://www.deepcode.ai/api/gh/badge?key=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJwbGF0Zm9ybTEiOiJnaCIsIm93bmVyMSI6InVsZjEiLCJyZXBvMSI6InNwYXJzaXR5LXBhdHRlcm4iLCJpbmNsdWRlTGludCI6ZmFsc2UsImF1dGhvcklkIjoyOTQ1MiwiaWF0IjoxNjE5NTQwNDY4fQ.84-ii4Nz_CiGiojJTDIenWenL4vwVLBB9sapz9soHyA)](https://www.deepcode.ai/app/gh/ulf1/sparsity-pattern/_/dashboard?utm_content=gh%2Fulf1%2Fsparsity-pattern)
 
 # sparsity-pattern
 Generate different types of sparsity pattern for sparse matrices.
@@ -91,7 +94,14 @@ pip3 install -r requirements-demo.txt
 * Jupyter for the examples: `jupyter lab`
 * Check syntax: `flake8 --ignore=F401 --exclude=$(grep -v '^#' .gitignore | xargs | sed -e 's/ /,/g')`
 * Run Unit Tests: `pytest`
-* Upload to PyPi with twine: `python setup.py sdist && twine upload -r pypi dist/*`
+
+Publish
+
+```sh
+pandoc README.md --from markdown --to rst -s -o README.rst
+python setup.py sdist 
+twine upload -r pypi dist/*
+```
 
 ### Clean up 
 

requirements-dev.txt

@@ -1,4 +1,5 @@
 # syntax check, unit test, profiling
+setuptools>=56.0.0
 flake8>=3.8.4
 pytest>=6.2.1
 twine==3.3.0

setup.py

@@ -1,5 +1,11 @@
 from setuptools import setup
-import pypandoc
+import os
+
+
+def read(fname):
+    with open(os.path.join(os.path.dirname(__file__), fname)) as fp:
+        s = fp.read()
+    return s
 
 
 def get_version(path):
@@ -17,13 +23,12 @@ def get_version(path):
       description=(
           "Generate different types of sparsity pattern for sparse matrices."
       ),
-      long_description=pypandoc.convert('README.md', 'rst'),
+      long_description=read('README.rst'),
       url='http://github.com/ulf1/sparsity-pattern',
       author='Ulf Hamster',
       author_email='554c46@gmail.com',
       license='Apache License 2.0',
       packages=['sparsity_pattern'],
-      install_requires=[
-          'setuptools>=40.0.0'],
+      # install_requires=[],
       python_requires='>=3.6',
       zip_safe=True)

sparsity_pattern/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.4.1'
+__version__ = '0.4.2'
 
 from .generators import (
     get, diag, dense_quadratic, dense_pythonic, nodiag_quadratic,

sparsity_pattern/generators.py

@@ -35,15 +35,15 @@ def get(sp: str, *args, **kwargs) -> List[List[int]]:
         idx = sparsity_pattern.get('triu', n=5, k=-1)
     """
     if sp in ("diag"):
-        arr = diag(*args, **kwargs)
+        arr = diag(*args)
     elif sp in ("dense"):
         if (len(args) + len(kwargs)) == 1:
-            arr = dense_quadratic(*args, **kwargs)
+            arr = dense_quadratic(*args)
         else:
             arr = dense_pythonic(*args, **kwargs)
     elif sp in ("nodiag"):
         if (len(args) + len(kwargs)) == 1:
-            arr = nodiag_quadratic(*args, **kwargs)
+            arr = nodiag_quadratic(*args)
         else:
             arr = nodiag_pythonic(*args, **kwargs)
     elif sp in ("block"):