Merge pull request #840 from rickecon/mkl

Remove mkl dependency from environment.yml and setup.py
PSLmodels · Jan 5, 2023 · ce19afa · ce19afa
2 parents 86b8a3c + b95261f
commit ce19afa
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 74 deletions.
diff --git a/conda.recipe/bld.bat b/conda.recipe/bld.bat
diff --git a/conda.recipe/build.sh b/conda.recipe/build.sh
diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
diff --git a/environment.yml b/environment.yml
@@ -5,7 +5,6 @@ dependencies:
 - python>=3.7.7, <3.11  # This restriction can be removed as soon as we test Python 3.11
 - ipython
 - setuptools
-- mkl>=2021.4.0
 - psutil
 - scipy>=1.7.1
 - pandas>=1.2.5
@@ -20,4 +19,4 @@ dependencies:
 - coverage
 - requests
 - openpyxl
-- black
+- black
diff --git a/ogcore/__init__.py b/ogcore/__init__.py
@@ -19,4 +19,4 @@
 from ogcore.txfunc import *
 from ogcore.utils import *
 
-__version__ = "0.10.0"
+__version__ = "0.10.1"
diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="ogcore",
-    version="0.10.0",
+    version="0.10.1",
     author="Jason DeBacker and Richard W. Evans",
     license="CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
     description="A general equilibribum overlapping generations model for fiscal policy analysis",
@@ -25,7 +25,6 @@
     include_packages=True,
     python_requires=">=3.7.7, <3.11",
     install_requires=[
-        "mkl>=2021.4.0",
         "psutil",
         "scipy>=1.7.1",
         "pandas>=1.2.5",
@@ -43,9 +42,8 @@
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Topic :: Software Development :: Libraries :: Python Modules",
     ],
     tests_require=["pytest"],