Merge pull request #500 from HajimeKawahara/radis0.15

Matches the installation requirements for radis 0.15

.github/workflows/main.yml

@@ -17,10 +17,10 @@ jobs:
         uses: actions/checkout@v2
 
       # Setup Python
-      - name: Set up Python 3.10
+      - name: Set up Python 3.11
         uses: actions/setup-python@v2
         with:
-          python-version: '3.10'
+          python-version: '3.11'
 
       # install package	  
       - name: Install dependencies

requirements.txt

@@ -4,25 +4,15 @@ hitran-api
 beautifulsoup4
 hjson          # Json with comments (for default_radis.json)
 tqdm
-lxml           # parser used for ExoMol website
-publib>=0.3.2  # Plotting styles for Matplotlib
-peakutils
-ruamel.yaml
-json-tricks>=3.15.0  # to deal with non jsonable formats
-mpldatacursor
-configparser
-cython
-termcolor
+PyMieScatt
+radis
+numba
 tables
-joblib
 pandas
-plotly
-progressbar2
-numba
-mpldatacursor
-publib
-plotly
+termcolor
+h5py
+joblib
+astropy
 psutil
-seaborn
-PyMieScatt
+json_tricks
 numpy<2

setup.py

@@ -5,13 +5,14 @@
 from setuptools import find_packages, setup
 
 # PROJECT SPECIFIC
-NAME = 'ExoJAX'
-PACKAGES = find_packages(where='src')
-META_PATH = os.path.join('src', 'exojax', '__init__.py')
+NAME = "ExoJAX"
+PACKAGES = find_packages(where="src")
+META_PATH = os.path.join("src", "exojax", "__init__.py")
 CLASSIFIERS = [
-    'Programming Language :: Python',
+    "Programming Language :: Python",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
     "Operating System :: OS Independent",
 ]
 
@@ -20,79 +21,73 @@
 
 
 def read(*parts):
-    with codecs.open(os.path.join(HERE, *parts), 'rb', 'utf-8') as f:
+    with codecs.open(os.path.join(HERE, *parts), "rb", "utf-8") as f:
         return f.read()
 
 
 def find_meta(meta, meta_file=read(META_PATH)):
     meta_match = re.search(
-        r"^__{meta}__ = ['\"]([^'\"]*)['\"]".format(meta=meta), meta_file,
-        re.M)
+        r"^__{meta}__ = ['\"]([^'\"]*)['\"]".format(meta=meta), meta_file, re.M
+    )
     if meta_match:
         return meta_match.group(1)
-    raise RuntimeError('Unable to find __{meta}__ string.'.format(meta=meta))
+    raise RuntimeError("Unable to find __{meta}__ string.".format(meta=meta))
 
 
 def read_requirements():
-    with open('requirements.txt', 'r') as file:
+    with open("requirements.txt", "r") as file:
         return file.readlines()
 
 
-
-
-if __name__ == '__main__':
+if __name__ == "__main__":
     setup(
         name=NAME,
         use_scm_version={
-            'write_to':
-            os.path.join('src', 'exojax', '{0}_version.py'.format(NAME)),
-            'write_to_template':
-            '__version__ = "{version}"\n',
+            "write_to": os.path.join("src", "exojax", "{0}_version.py".format(NAME)),
+            "write_to_template": '__version__ = "{version}"\n',
         },
-        version='1.5',
-        author=find_meta('author'),
-        author_email=find_meta('email'),
-        maintainer=find_meta('author'),
-        maintainer_email=find_meta('email'),
-        url=find_meta('uri'),
-        license=find_meta('license'),
-        description=find_meta('description'),
-        long_description=open('README.md').read(),
-        long_description_content_type='text/markdown',
+        version="1.5",
+        author=find_meta("author"),
+        author_email=find_meta("email"),
+        maintainer=find_meta("author"),
+        maintainer_email=find_meta("email"),
+        url=find_meta("uri"),
+        license=find_meta("license"),
+        description=find_meta("description"),
+        long_description=open("README.md").read(),
+        long_description_content_type="text/markdown",
         packages=PACKAGES,
-        python_requires='>=3.9',
-        package_dir={'': 'src'},
+        python_requires=">=3.9",
+        package_dir={"": "src"},
         include_package_data=True,
         install_requires=read_requirements(),
         classifiers=CLASSIFIERS,
         zip_safe=False,
-        options={'bdist_wheel': {
-            'universal': '1'
-        }},
+        options={"bdist_wheel": {"universal": "1"}},
     )
 
-# VAEX UNISTALL and REINSTALL See Issue 2376 vaex https://github.com/vaexio/vaex/issues/2376    
-import subprocess
-import sys
+# VAEX UNISTALL and REINSTALL See Issue 2376 vaex https://github.com/vaexio/vaex/issues/2376
+# import subprocess
+# import sys
 
-def install_radis_develop():
-    subprocess.check_call([sys.executable, "-m", "pip", "install", "-e", 'git+https://github.com/radis/radis@develop#egg=radis'])
+# def install_radis_develop():
+#    subprocess.check_call([sys.executable, "-m", "pip", "install", "-e", 'git+https://github.com/radis/radis@develop#egg=radis'])
 
 
-def uninstall(package):
-    subprocess.check_call([sys.executable, "-m", "pip", "uninstall", "-y", package])
+# def uninstall(package):
+#    subprocess.check_call([sys.executable, "-m", "pip", "uninstall", "-y", package])
 
-def reinstall(package):
-    subprocess.check_call([sys.executable, "-m", "pip", "uninstall", "-y", package])
-    subprocess.check_call([sys.executable, "-m", "pip", "install", package])
+# def reinstall(package):
+#    subprocess.check_call([sys.executable, "-m", "pip", "uninstall", "-y", package])
+#    subprocess.check_call([sys.executable, "-m", "pip", "install", package])
 
-install_radis_develop()
-uninstall('vaex-core')
-uninstall('vaex-astro')
-uninstall('vaex-jupyter')
-uninstall('vaex-ml')
-uninstall('vaex-hdf5')
-uninstall('vaex-server')
-uninstall('vaex-viz')
+# install_radis_develop()
+# uninstall('vaex-core')
+# uninstall('vaex-astro')
+# uninstall('vaex-jupyter')
+# uninstall('vaex-ml')
+# uninstall('vaex-hdf5')
+# uninstall('vaex-server')
+# uninstall('vaex-viz')
 
-reinstall('vaex')
+# reinstall('vaex')