Merge pull request #32 from saraedum/license

Actually update license to GPLv2+

.zenodo.json

@@ -15,7 +15,7 @@
  }
  ], 
 
- "license": "GPL-3.0-or-later",
+ "license": "GPL-2.0-or-later",
  "title": "veerer",
  "description": "<p>Veerer is a Python package to deal with veering triangulations of surfaces and their associated flat structures.</p>"
 }

setup.py

@@ -4,17 +4,19 @@
 # Copyright (C) 2019-2023 Vincent Delecroix
 # 2023 Julian Rüth
 #
-# veerer is free software: you can redistribute it and/or modify it under the
-# terms of the GNU General Public License version 3 as published by the Free
-# Software Foundation.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# veerer is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with veerer. If not, see <https://www.gnu.org/licenses/>.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # ****************************************************************************
 from setuptools import setup, Extension
 from Cython.Build import cythonize
@@ -35,14 +37,14 @@
  author_email="contact@flatsurf.org",
  url="https://github.com/flatsurf/veerer",
  packages=["veerer", "veerer.polyhedron"],
- license="GNU General Public License, version 3",
+ license = 'GPL 2.0+',
  ext_modules=cythonize(extensions),
  install_requires=[],
  setup_requires=["Cython"],
  classifiers=[
  "Development Status :: 4 - Beta",
  "Intended Audience :: Science/Research",
- "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+ "License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)",
  "Natural Language :: English",
  "Operating System :: OS Independent",
  "Programming Language :: Python",

tests/test_quadrangulation_flip_sequence.py

@@ -136,7 +136,7 @@ def test_failure_conjugate_in_H6():
  [((1,), (1,)), ((1,), (1,)), ((0,), (1,)), ((5,), (1,))],
  "(0,4,1,5,2,6,3)"),
  ("(0,6,5)(1,4,3,2)", "(0,6)(1,2,5)(3,4)",
- [((1,), (1,)), ((4,), (1,)), ((1,), (1,)), ((1,), (1,))], 
+ [((1,), (1,)), ((4,), (1,)), ((1,), (1,)), ((1,), (1,))],
  "(0,4,1,5,2,6,3)"),
  ("(0,4,2)(1)(3)(5,6)", "(0,5,6)(1,2,3,4)",
  [((1,), (1,)), ((1,), (1,)), ((0,), (1,)), ((0,), (1,))],
@@ -177,7 +177,7 @@ def test_failure_conjugate_in_H6():
 # ("(0,3,2,1)", "(0,2)(1)(3)", [((0,), (2,)), ((0, 3, 2), (0, 0, 1))], "(0,1,2,3)"),
 # ("(0,2)(1)(3)", "(0,1,2,3)", [((0, 1, 3), (0, 1, 0)), ((1,), (2,))], "(0,3,2,1)"),
 # ("(0,2)(1)(3)", "(0,1,2,3)", [((0, 1, 3), (0, 0, 1)), ((3,), (2,))], "(0,3,2,1)")]
-# 
+#
 # flip_sequences = [VeeringQuadrangulationFlipSequence(VeeringQuadrangulation(pr, pl), flips, relabelling) for pr, pl, flips, relabelling in data]
 #
 # N = len(flip_sequences)

veerer/__init__.py

@@ -9,17 +9,19 @@
 #
 # Copyright (C) 2023 Vincent Delecroix
 #
-# veerer is free software: you can redistribute it and/or modify it under the
-# terms of the GNU General Public License version 3 as published by the Free
-# Software Foundation.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# veerer is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with veerer. If not, see <https://www.gnu.org/licenses/>.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # ****************************************************************************
 
 from .constants import RED, BLUE, PURPLE, GREEN, HORIZONTAL, VERTICAL, RIGHT, LEFT, UP, DOWN

veerer/automaton.py

@@ -8,17 +8,19 @@
 # 2018-2023 Vincent Delecroix
 # 2018 Saul Schleimer
 #
-# veerer is free software: you can redistribute it and/or modify it under the
-# terms of the GNU General Public License version 3 as published by the Free
-# Software Foundation.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-#  veerer is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
-# along with veerer. If not, see <https://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # ****************************************************************************
 
 import os
@@ -945,7 +947,7 @@ class GeometricAutomatonSubspace(Automaton):
  n=6: Geometric veering linear constraint automaton with 800 vertices
  """
  _name = 'geometric veering linear constraint'
- 
+
  def _setup(self, backend=None):
  self._backend = backend
 

veerer/constants.py

@@ -12,17 +12,19 @@
 # 2018-2023 Vincent Delecroix
 # 2018 Saul Schleimer
 #
-# veerer is free software: you can redistribute it and/or modify it under the
-# terms of the GNU General Public License version 3 as published by the Free
-# Software Foundation.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# veerer is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with veerer. If not, see <https://www.gnu.org/licenses/>.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # ****************************************************************************
 
 NONE = 0

veerer/cover.py

@@ -8,17 +8,19 @@
 # 2018-2023 Vincent Delecroix
 # 2018 Saul Schleimer
 #
-# veerer is free software: you can redistribute it and/or modify it under the
-# terms of the GNU General Public License version 3 as published by the Free
-# Software Foundation.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# veerer is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with veerer. If not, see <https://www.gnu.org/licenses/>.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # ****************************************************************************
 
 from array import array
@@ -94,7 +96,7 @@ def __init__(self, triangulation, cover, mutable=False, check=True):
  for i,p in enumerate(cover):
  if p is None:
  cover[i] = perm_init(range(d))
- 
+
  ep = self._t.edge_permutation(copy=False)
  n = self._t.num_half_edges()
  ne = self._t.num_edges()

veerer/env.py

@@ -10,17 +10,19 @@
 #
 # Copyright (C) 2023 Vincent Delecroix
 #
-# veerer is free software: you can redistribute it and/or modify it under the
-# terms of the GNU General Public License version 3 as published by the Free
-# Software Foundation.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# veerer is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with veerer. If not, see <https://www.gnu.org/licenses/>.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # ****************************************************************************
 
 CHECK = False

veerer/flat_structure.py

@@ -6,17 +6,19 @@
 #
 # Copyright (C) 2018-2023 Vincent Delecroix
 #
-# veerer is free software: you can redistribute it and/or modify it under the
-# terms of the GNU General Public License version 3 as published by the Free
-# Software Foundation.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# veerer is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with veerer. If not, see <https://www.gnu.org/licenses/>.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # ****************************************************************************
 
 from sage.structure.sequence import Sequence

veerer/flip_sequence.py

@@ -41,17 +41,19 @@
 #
 # Copyright (C) 2020 Vincent Delecroix
 #
-# veerer is free software: you can redistribute it and/or modify it under the
-# terms of the GNU General Public License version 3 as published by the Free
-# Software Foundation.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# veerer is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with veerer. If not, see <https://www.gnu.org/licenses/>.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # ****************************************************************************
 
 from .constants import colour_from_char, colour_to_char, RED, BLUE, PURPLE, GREEN, HORIZONTAL, VERTICAL

veerer/layout.py

@@ -18,17 +18,19 @@
 # 2018-2023 Vincent Delecroix
 # 2018 Saul Schleimer
 #
-# veerer is free software: you can redistribute it and/or modify it under the
-# terms of the GNU General Public License version 3 as published by the Free
-# Software Foundation.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# veerer is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with veerer. If not, see <https://www.gnu.org/licenses/>.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # ****************************************************************************
 
 import math

veerer/linear_family.py

@@ -6,17 +6,19 @@
 #
 # Copyright (C) 2023 Vincent Delecroix
 #
-# veerer is free software: you can redistribute it and/or modify it under the
-# terms of the GNU General Public License version 3 as published by the Free
-# Software Foundation.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# veerer is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with veerer. If not, see <https://www.gnu.org/licenses/>.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # ****************************************************************************
 
 from array import array

veerer/measured_train_track.py

@@ -3,17 +3,19 @@
 #
 # Copyright (C) 2018-2023 Vincent Delecroix
 #
-# veerer is free software: you can redistribute it and/or modify it under the
-# terms of the GNU General Public License version 3 as published by the Free
-# Software Foundation.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# veerer is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with veerer. If not, see <https://www.gnu.org/licenses/>.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # ****************************************************************************
 
 from sage.categories.fields import Fields
@@ -80,7 +82,7 @@ def lengths(self):
  def __repr__(self):
  return "MeasuredTrainTrack({}, {})".format(
  self._triangulation, self._lengths)
- 
+
  def __call__(self, p, iterations=1):
  r"""
  p = (i,x) where
@@ -89,7 +91,7 @@ def __call__(self, p, iterations=1):
 
  EXAMPLES::
 
- sage: from veerer import * 
+ sage: from veerer import *
  sage: v0 = vector((1, 0, 1, 1))
  sage: v1 = vector((0, 1, 1, 1))
  sage: t = Triangulation("(0,1,2)(~0,~1,3)")

veerer/misc.py

@@ -6,17 +6,19 @@
 #
 # Copyright (C) 2018-2023 Vincent Delecroix
 #
-# veerer is free software: you can redistribute it and/or modify it under the
-# terms of the GNU General Public License version 3 as published by the Free
-# Software Foundation.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# veerer is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with veerer. If not, see <https://www.gnu.org/licenses/>.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # ****************************************************************************
 
 from .env import ppl