Merge pull request #74 from nschloe/import-fix

Import fix

Author: nschloe

README.md

@@ -404,4 +404,4 @@ pytest
 
 ### License
 
-pygalmesh is published under the [GPLv3+ license](https://www.gnu.org/licenses/gpl-3.0.en.html).
+pygalmesh is published under the [GPLv3 license](https://www.gnu.org/licenses/gpl-3.0.en.html).

pygalmesh/__about__.py

@@ -5,6 +5,6 @@
     import importlib_metadata as metadata
 
 try:
-    __version__ = metadata.version("optimesh")
+    __version__ = metadata.version("pygalmesh")
 except Exception:
     __version__ = "unknown"

pygalmesh/_cli/helpers.py

@@ -2,7 +2,7 @@
 
 from _pygalmesh import _get_cgal_version
 
-from ..__about__ import __copyright__, __version__
+from ..__about__ import __version__
 
 
 def _get_version_text():
@@ -15,6 +15,6 @@ def _get_version_text():
                 sys.version_info.micro,
                 _get_cgal_version(),
             ),
-            __copyright__,
+            "Copyright (c) 2016-2020, Nico Schlömer <nico.schloemer@gmail.com>",
         ]
     )

setup.cfg

@@ -1,13 +1,13 @@
 [metadata]
 name = pygalmesh
-version = 0.6.1
+version = 0.6.2
 url = https://github.com/nschloe/pygalmesh
 author = Nico Schlömer
 email = nico.schloemer@gmail.com
 description = Python frontend to CGAL's 3D mesh generation capabilities
 long_description = file: README.md
 long_description_content_type = text/markdown
-license = GPLv3+
+license = GPLv3
 classifiers =
     Development Status :: 4 - Beta
     License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)

src/generate_from_off.cpp

@@ -41,8 +41,10 @@ void generate_from_off(const std::string& infile, const std::string& outfile,
   std::ifstream input(infile);
   input >> polyhedron;
   if (!input.good()) {
+    // Even if the mesh exists, it may not be valid, see
+    // <https://github.com/CGAL/cgal/issues/4632>
     std::stringstream msg;
-    msg << "Cannot read input file \"" << infile << "\"" << std::endl;
+    msg << "Invalid input file \"" << infile << "\"" << std::endl;
     throw std::runtime_error(msg.str());
   }
   input.close();