From b006c9a163f55aba044a9ad8532c65c13f35121f Mon Sep 17 00:00:00 2001
From: hartytp <thomas.harty@physics.ox.ac.uk>
Date: Thu, 9 May 2019 14:35:26 +0100
Subject: [PATCH] add conda package

This is a bit of a hack because:
1. The git tags used in quamash upset conda-build (which doesn't like hyphens) so I manually retagged
2. setup.py imported quamash for metadata (version etc) which didn't work without a qt package, so I moved that
data into setup.py (HACK/TO FIX)
---
 conda/quamash/meta.yaml | 18 ++++++++++++++++++
 setup.py                | 18 ++++++++++++------
 2 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 conda/quamash/meta.yaml

diff --git a/conda/quamash/meta.yaml b/conda/quamash/meta.yaml
new file mode 100644
index 0000000..b025b4e
--- /dev/null
+++ b/conda/quamash/meta.yaml
@@ -0,0 +1,18 @@
+package:
+  name: quamash
+  version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}
+
+source:
+  path: ../..
+
+build:
+  noarch: python
+  number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+  string: py35_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_DESCRIBE_HASH", "")[1:] }}
+  script: python setup.py install
+
+requirements:
+  build:
+    - python 3.5*
+  run:
+    - python 3.5*
\ No newline at end of file
diff --git a/setup.py b/setup.py
index c1ffd8d..1813d97 100644
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,15 @@
 from setuptools import setup
-import quamash
+
 import re
 import os.path
 
-groups = re.findall(r'(.+?) <(.+?)>(?:,\s*)?', quamash.__author__)
+__author__ = 'Mark Harviston <mark.harviston@gmail.com>, Arve Knudsen <arve.knudsen@gmail.com>'
+__version__ = '0.6.1'
+__url__ = 'https://github.com/harvimt/quamash'
+__license__ = 'BSD'
+__all__ = ['QEventLoop', 'QThreadExecutor']
+
+groups = re.findall(r'(.+?) <(.+?)>(?:,\s*)?', __author__)
 authors = [x[0].strip() for x in groups]
 emails = [x[1].strip() for x in groups]
 
@@ -13,13 +19,13 @@
 
 setup(
 	name='Quamash',
-	version=quamash.__version__,
-	url=quamash.__url__,
+	version=__version__,
+	url=__url__,
 	author=', '.join(authors),
 	author_email=', '.join(emails),
 	packages=['quamash'],
-	license=quamash.__license__,
-	description=quamash.__doc__,
+	license=__license__,
+	description=__doc__,
 	long_description=long_description,
 	keywords=['Qt', 'asyncio'],
 	classifiers=[