Merge pull request #112 from PermutaTriangle/develop

Version 1.4.2
PermutaTriangle · Jun 17, 2020 · adc81a2 · adc81a2
2 parents 0e06045 + a5b390d
commit adc81a2
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## 1.4.2 - 2020-06-17
+### Fixed
+- Make `permuta.bisc.permsets` a proper package.
+
 ## 1.4.1 - 2020-06-12
 ### Removed
 - The unused `permuta.misc.misc` module

diff --git a/permuta/bisc/permsets/__init__.py b/permuta/bisc/permsets/__init__.py
@@ -0,0 +1,35 @@
+from .perm_properties import (
+    Baxter,
+    BKV_sortable,
+    SimSun,
+    West_2_stack_sortable,
+    West_3_stack_sortable,
+    av_231_and_mesh,
+    dihedral,
+    forest_like,
+    hard_mesh,
+    in_alternating_group,
+    quick_sortable,
+    smooth,
+    stack_sortable,
+    yt_perm_avoids_22,
+    yt_perm_avoids_32,
+)
+
+__all__ = [
+    "Baxter",
+    "BKV_sortable",
+    "SimSun",
+    "West_2_stack_sortable",
+    "West_3_stack_sortable",
+    "av_231_and_mesh",
+    "dihedral",
+    "forest_like",
+    "hard_mesh",
+    "in_alternating_group",
+    "quick_sortable",
+    "smooth",
+    "stack_sortable",
+    "yt_perm_avoids_22",
+    "yt_perm_avoids_32",
+]
diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@ def read(fname):
 
 setup(
     name="permuta",
-    version="1.4.1",
+    version="1.4.2",
     author="Permuta Triangle",
     author_email="[email protected]",
     description="A comprehensive high performance permutation library.",

diff --git a/tox.ini b/tox.ini
@@ -22,7 +22,7 @@ basepython =
     pypy36: pypy3
 deps =
     pytest==5.4.3
-    pytest-timeout==1.3.4
+    pytest-timeout==1.4.1
 commands = pytest
 
 [pytest]