From 449aa2146c01f95c41ac82427a2633fb6beade05 Mon Sep 17 00:00:00 2001
From: Christian Diener <ch.diener@gmail.com>
Date: Fri, 19 Apr 2024 12:22:19 +0200
Subject: [PATCH] pin micom version

---
 q2-micom-osx.yml                   | 13 -------------
 q2-micom-linux.yml => q2-micom.yml |  2 +-
 setup.cfg                          | 28 ++++++++++++++--------------
 3 files changed, 15 insertions(+), 28 deletions(-)
 delete mode 100644 q2-micom-osx.yml
 rename q2-micom-linux.yml => q2-micom.yml (88%)

diff --git a/q2-micom-osx.yml b/q2-micom-osx.yml
deleted file mode 100644
index c107309..0000000
--- a/q2-micom-osx.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-channels:
-  - conda-forge
-  - bioconda
-dependencies:
-  - cobra
-  - rich
-  - jinja2
-  - python-symengine>=0.6.1
-  - pip
-  - osqp>=0.6.2
-  - pip:
-    - q2-micom
-    - https://github.com/micom-dev/micom/raw/main/.github/wheels/highspy-1.5.3-cp38-cp38-macosx_10_9_x86_64.whl
diff --git a/q2-micom-linux.yml b/q2-micom.yml
similarity index 88%
rename from q2-micom-linux.yml
rename to q2-micom.yml
index 1fe5040..8a22911 100644
--- a/q2-micom-linux.yml
+++ b/q2-micom.yml
@@ -3,6 +3,7 @@ channels:
   - bioconda
 dependencies:
   - cobra
+  - optlang>=1.5.1
   - rich
   - jinja2
   - python-symengine>=0.6.1
@@ -10,4 +11,3 @@ dependencies:
   - osqp>=0.6.2
   - pip:
     - q2-micom
-    - highspy>=1.5.3
diff --git a/setup.cfg b/setup.cfg
index 0d0e07a..2042bad 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -12,7 +12,7 @@ long_description = file: README.md
 long_description_content_type = text/markdown
 license = Apache License 2.0
 url = https://github.com/micom-dev/q2-micom
-classifiers = 
+classifiers =
 	Development Status :: 4 - Beta
 	Intended Audience :: Science/Research
 	Topic :: Scientific/Engineering :: Bio-Informatics
@@ -22,7 +22,7 @@ classifiers =
 	Programming Language :: Python :: 3.9
 	Programming Language :: Python :: 3.10
 	Programming Language :: Python :: 3.11
-keywords = 
+keywords =
 	microbiome
 	modeling
 	metabolism
@@ -32,25 +32,25 @@ keywords =
 zip_safe = False
 packages = find:
 python_requires = >=3.6
-install_requires = 
-	cobra>=0.18.1
-	micom>=0.33.1
+install_requires =
+	cobra>=0.29.0
+	micom>=0.34.1,<0.35
 	jinja2>=2.10.3
-	qiime2>=2021.2
+	qiime2>=2023.2
 	rich>=6.0
 	pandas>=1.0
-tests_require = 
+tests_require =
 	coverage
 	pytest
 	pytest-cov
 	flake8
 
 [options.package_data]
-q2_micom = 
+q2_micom =
 	citations.bib
 
 [options.entry_points]
-qiime2.plugins = 
+qiime2.plugins =
 	q2-micom = q2_micom.plugin_setup:plugin
 
 [bumpversion:file:setup.py]
@@ -62,7 +62,7 @@ search = __version__ = "{current_version}"
 replace = __version__ = "{new_version}"
 
 [tool:pytest]
-filterwarnings = 
+filterwarnings =
 	ignore::DeprecationWarning
 	ignore::FutureWarning
 
@@ -75,15 +75,15 @@ branch = True
 omit = q2_micom/tests/*
 
 [coverage:report]
-exclude_lines = 
+exclude_lines =
 	pragma: no cover
-	
+
 	def __repr__
 	if self\.debug
-	
+
 	raise AssertionError
 	raise NotImplementedError
-	
+
 	if 0:
 	if __name__ == .__main__.:
 ignore_errors = True