From 806f95bc06c530d69c93502ca8866de80c9e8725 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 15 Jan 2020 07:50:17 +0000
Subject: [PATCH] switch to setuptools_scm

MANIFEST.in is dead
---
 MANIFEST.in                             | 10 ----------
 matrix_synapse_saml_mozilla/__init__.py |  8 +++++++-
 requirements.txt                        |  1 -
 setup.py                                |  3 ++-
 tox.ini                                 |  6 ++----
 5 files changed, 11 insertions(+), 17 deletions(-)
 delete mode 100644 MANIFEST.in
 delete mode 100644 requirements.txt

diff --git a/MANIFEST.in b/MANIFEST.in
deleted file mode 100644
index 9965876..0000000
--- a/MANIFEST.in
+++ /dev/null
@@ -1,10 +0,0 @@
-include *.in
-include LICENSE
-include tox.ini
-include requirements.txt
-
-prune doc
-
-recursive-include matrix_synapse_saml_mozilla *.py
-graft matrix_synapse_saml_mozilla/res
-recursive-include tests *.py
diff --git a/matrix_synapse_saml_mozilla/__init__.py b/matrix_synapse_saml_mozilla/__init__.py
index a0f4596..82a9b3f 100644
--- a/matrix_synapse_saml_mozilla/__init__.py
+++ b/matrix_synapse_saml_mozilla/__init__.py
@@ -13,9 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from pkg_resources import get_distribution, DistributionNotFound
+
 from matrix_synapse_saml_mozilla.mapping_provider import SamlMappingProvider
 from matrix_synapse_saml_mozilla.username_picker import pick_username_resource
 
-__version__ = "0.1.dev5"
+try:
+    __version__ = get_distribution(__name__).version
+except DistributionNotFound:
+    # package is not installed
+    pass
 
 __all__ = ["SamlMappingProvider", "pick_username_resource"]
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index d6e1198..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
--e .
diff --git a/setup.py b/setup.py
index be253ff..b15ed7c 100755
--- a/setup.py
+++ b/setup.py
@@ -41,10 +41,11 @@ def exec_file(path_segments, name):
 
 setup(
     name="matrix-synapse-saml-mozilla",
-    version=exec_file(("matrix_synapse_saml_mozilla/__init__.py",), "__version__"),
     packages=["matrix_synapse_saml_mozilla"],
     include_package_data=True,
     description="An Mozilla-flavoured SAML MXID mapper for Synapse",
+    use_scm_version=True,
+    setup_requires=["setuptools_scm"],
     install_requires=["attr>=0.3.1", "pysaml2>=4.5.0"],
     long_description=read_file(("README.md",)),
     long_description_content_type="text/markdown",
diff --git a/tox.ini b/tox.ini
index 6e1367a..706d1a2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = packaging, lint, tests
+envlist = lint, tests
 
 [testenv]
 setenv =
@@ -14,10 +14,8 @@ commands =
 
 [testenv:packaging]
 skip_install = True
-deps =
-    check-manifest
 commands =
-    check-manifest
+    /bin/true
 
 [testenv:lint]
 skip_install = True