Merge pull request #61 from nschloe/modernize

Modernize

Author: nschloe

.github/workflows/ci.yml

@@ -1,6 +1,6 @@
 name: ci
 
-on: [push]
+on: [pull_request]
 
 jobs:
   lint:

.travis.yml

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016-2019 Nico Schlömer
+Copyright (c) 2016-2020 Nico Schlömer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LICENSE

@@ -8,6 +8,7 @@ tag:
 	@echo "Tagging v$(VERSION)..."
 	git tag v$(VERSION)
 	git push --tags
+	curl -H "Authorization: token `cat $(HOME)/.github-access-token`" -d '{"tag_name": "$(VERSION)"}' https://api.github.com/repos/nschloe/pygalmesh/releases
 
 upload: setup.py
 	# Make sure we're on the master branch

Makefile

@@ -6,9 +6,11 @@
 [![CircleCI](https://img.shields.io/circleci/project/github/nschloe/pygalmesh/master.svg?style=flat-square)](https://circleci.com/gh/nschloe/pygalmesh/tree/master)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg?style=flat-square)](https://github.com/psf/black)
 [![PyPi Version](https://img.shields.io/pypi/v/pygalmesh.svg?style=flat-square)](https://pypi.org/project/pygalmesh)
+[![PyPI pyversions](https://img.shields.io/pypi/pyversions/pygalmesh.svg?style=flat-square)](https://pypi.org/pypi/pygalmesh/)
 [![Debian CI](https://badges.debian.net/badges/debian/testing/python3-pygalmesh/version.svg?style=flat-square)](https://tracker.debian.org/pkg/python3-pygalmesh)
 [![GitHub stars](https://img.shields.io/github/stars/nschloe/pygalmesh.svg?style=flat-square&label=Stars&logo=github)](https://github.com/nschloe/pygalmesh)
 [![PyPi downloads](https://img.shields.io/pypi/dm/pygalmesh.svg?style=flat-square)](https://pypistats.org/packages/pygalmesh)
+[![Slack](https://img.shields.io/static/v1?logo=slack&label=chat&message=on%20slack&color=4a154b&style=flat-square)](https://app.slack.com/client/TTL6Q54A3/CTLHRPYLF)
 
 pygalmesh is a Python frontend to [CGAL](https://www.cgal.org/)'s [3D mesh generation
 capabilities](https://doc.cgal.org/latest/Mesh_3/index.html).
@@ -201,8 +203,7 @@ e.g.,
 import pygalmesh
 class Heart(pygalmesh.DomainBase):
     def __init__(self):
-        super(Heart, self).__init__()
-        return
+        super().__init__()
 
     def eval(self, x):
         return (x[0]**2 + 9.0/4.0 * x[1]**2 + x[2]**2 - 1)**3 \
@@ -272,8 +273,7 @@ import pygalmesh
 
 class Schwarz(pygalmesh.DomainBase):
     def __init__(self):
-        super(Schwarz, self).__init__()
-        return
+        super().__init__()
 
     def eval(self, x):
         x2 = numpy.cos(x[0] * 2 * numpy.pi)
@@ -353,11 +353,11 @@ sudo apt install libcgal-dev libeigen3-dev
 After that, pygalmesh can be [installed from the Python Package
 Index](https://pypi.org/project/pygalmesh/), so with
 ```
-pip3 install -U pygalmesh
+pip install -U pygalmesh
 ```
 you can install/upgrade.
 
-[meshio](https://github.com/nschloe/meshio) (`pip3 install meshio`)
+[meshio](https://github.com/nschloe/meshio) (`pip install meshio`)
 can be helpful in processing the meshes.
 
 #### Manual installation

README.md

@@ -1,8 +1,8 @@
 __author__ = "Nico Schlömer"
 __author_email__ = "nico.schloemer@gmail.com"
-__copyright__ = "Copyright (C) 2016-2019 {} <{}>".format(__author__, __author_email__)
+__copyright__ = "Copyright (C) 2016-2020 {} <{}>".format(__author__, __author_email__)
 __license__ = "License :: OSI Approved :: MIT License"
-__version__ = "0.5.0"
+__version__ = "0.5.1"
 __maintainer__ = "Nico Schlömer"
 __status__ = "Development Status :: 4 - Beta"
 __url__ = "https://github.com/nschloe/pygalmesh"

pygalmesh/__about__.py

@@ -43,7 +43,6 @@ def volume_from_surface(argv=None):
         verbose=not args.quiet,
     )
     meshio.write(args.outfile, mesh)
-    return
 
 
 def _get_volume_from_surface_parser():
@@ -157,7 +156,6 @@ def inr(argv=None):
         verbose=not args.quiet,
     )
     meshio.write(args.outfile, mesh)
-    return
 
 
 def _get_inr_parser():

pygalmesh/cli.py

@@ -10,7 +10,7 @@
     exec(handle.read(), about)
 
 
-class get_pybind_include(object):
+class get_pybind_include:
     """Helper class to determine the pybind11 include path. The purpose of this class is
     to postpone importing pybind11 until it is actually installed, so that the
     ``get_include()`` method can be invoked.
@@ -63,7 +63,7 @@ def read(fname):
     author=about["__author__"],
     author_email=about["__author_email__"],
     setup_requires=["pybind11 >= 2.2"],
-    install_requires=["meshio", "numpy", "pybind11 >= 2.2"],
+    install_requires=["meshio >= 4.0.0, < 5.0.0", "numpy", "pybind11 >= 2.2"],
     python_requires=">=3",
     description="Python frontend to CGAL's 3D mesh generation capabilities",
     long_description=read("README.md"),
@@ -73,8 +73,10 @@ def read(fname):
         about["__status__"],
         about["__license__"],
         "Operating System :: OS Independent",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
         "Topic :: Scientific/Engineering",
         "Topic :: Scientific/Engineering :: Mathematics",
         "Topic :: Scientific/Engineering :: Physics",

setup.py

@@ -19,7 +19,8 @@ def test_inr():
     assert abs(max(mesh.points[:, 2]) - ref[4]) < tol * ref[4]
     assert abs(min(mesh.points[:, 2]) - ref[5]) < tol * ref[5]
 
-    vol = sum(helpers.compute_volumes(mesh.points, mesh.cells["tetra"]))
+    vol = sum(helpers.compute_volumes(mesh.points, mesh.get_cells_type("tetra")))
     ref = 2.725335e06
-    assert abs(vol - ref) < ref * 1.0e-3
-    return
+    # Debian needs 2.0e-2 here.
+    # <https://github.com/nschloe/pygalmesh/issues/60>
+    assert abs(vol - ref) < ref * 2.0e-2

test/test_inr.py

@@ -6,8 +6,7 @@
 def test_schwarz():
     class Schwarz(pygalmesh.DomainBase):
         def __init__(self):
-            super(Schwarz, self).__init__()
-            return
+            super().__init__()
 
         def eval(self, x):
             x2 = numpy.cos(x[0] * 2 * numpy.pi)