Merge pull request #12 from AtmoLib/cosmetics

pcubillos · web-flow · commit 2dff55f2a62c · 2025-07-29T15:00:06.000+02:00
minor fixes and copyright update
diff --git a/chemcat/__init__.py b/chemcat/__init__.py
@@ -1,18 +1,18 @@
-# Copyright (c) 2022-2024 Blecic and Cubillos
+# Copyright (c) 2022-2025 Blecic and Cubillos
 # chemcat is open-source software under the GPL-2.0 license (see LICENSE)
 
-__all__ = [
-    'cea',
-    'janaf',
-    'utils',
-]
-
 from .network import *
 from . import cea
 from . import janaf
 from . import utils
 from .version import __version__
 
+__all__ = [
+    'cea',
+    'janaf',
+    'utils',
+]
+
 __all__ += (
     network.__all__
 )
diff --git a/chemcat/cea/__init__.py b/chemcat/cea/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2024 Blecic and Cubillos
+# Copyright (c) 2022-2025 Blecic and Cubillos
 # chemcat is open-source software under the GPL-2.0 license (see LICENSE)
 
 from .cea import *
diff --git a/chemcat/cea/cea.py b/chemcat/cea/cea.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2024 Blecic and Cubillos
+# Copyright (c) 2022-2025 Blecic and Cubillos
 # chemcat is open-source software under the GPL-2.0 license (see LICENSE)
 
 __all__ = [
diff --git a/chemcat/janaf/__init__.py b/chemcat/janaf/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2024 Blecic and Cubillos
+# Copyright (c) 2022-2025 Blecic and Cubillos
 # chemcat is open-source software under the GPL-2.0 license (see LICENSE)
 
 from .janaf import *
diff --git a/chemcat/janaf/janaf.py b/chemcat/janaf/janaf.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2024 Blecic and Cubillos
+# Copyright (c) 2022-2025 Blecic and Cubillos
 # chemcat is open-source software under the GPL-2.0 license (see LICENSE)
 
 __all__ = [
diff --git a/chemcat/network.py b/chemcat/network.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2024 Blecic and Cubillos
+# Copyright (c) 2022-2025 Blecic and Cubillos
 # chemcat is open-source software under the GPL-2.0 license (see LICENSE)
 
 __all__ = [
diff --git a/chemcat/utils/__init__.py b/chemcat/utils/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2024 Blecic and Cubillos
+# Copyright (c) 2022-2025 Blecic and Cubillos
 # chemcat is open-source software under the GPL-2.0 license (see LICENSE)
 
 from .utils import *
diff --git a/chemcat/utils/utils.py b/chemcat/utils/utils.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2024 Blecic and Cubillos
+# Copyright (c) 2022-2025 Blecic and Cubillos
 # chemcat is open-source software under the GPL-2.0 license (see LICENSE)
 
 __all__ = [
@@ -396,8 +396,12 @@ def read_elemental(element_file):
     N :   7.830
     O :   8.690
     """
-    elements, dex = np.loadtxt(
-        element_file, dtype=str, comments='#', usecols=(1,2), unpack=True)
+    with warnings.catch_warnings():
+        # Ignore non-breaking warning for empty rows
+        warnings.simplefilter('ignore', category=UserWarning)
+        elements, dex = np.loadtxt(
+            element_file, dtype=str, comments='#', usecols=(1,2), unpack=True,
+        )
     dex_abundances = np.array(dex, float)
     return elements, dex_abundances
 
diff --git a/chemcat/version.py b/chemcat/version.py
@@ -1,6 +1,6 @@
-# Copyright (c) 2022-2024 Blecic and Cubillos
+# Copyright (c) 2022-2025 Blecic and Cubillos
 # chemcat is open-source software under the GPL-2.0 license (see LICENSE)
 
 # chemcat version:
-__version__ = '0.3.10'
+__version__ = '0.3.12'
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -21,9 +21,9 @@ authors = [
 ]
 
 dependencies = [
-    'numpy>=1.23.5',
-    'scipy>=1.5.4',
-    'matplotlib>=3.3.4',
+    'numpy>=2.0.0',
+    'scipy>=1.13.0',
+    'matplotlib>=3.9.2',
     'more-itertools>=8.4.0',
 ]
 
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-numpy>=1.23.5
-scipy>=1.5.4
-matplotlib>=3.3.4
+numpy>=2.0.0
+scipy>=1.13.0
+matplotlib>=3.9.2
 more-itertools>=8.4.0
diff --git a/setup.py b/setup.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2024 Blecic and Cubillos
+# Copyright (c) 2022-2025 Blecic and Cubillos
 # chemcat is open-source software under the GPL-2.0 license (see LICENSE)
 
 import os
diff --git a/src_c/_thermo.c b/src_c/_thermo.c
@@ -1,4 +1,4 @@
-// Copyright (c) 2022-2024 Blecic and Cubillos
+// Copyright (c) 2022-2025 Blecic and Cubillos
 // chemcat is open-source software under the GPL-2.0 license (see LICENSE)
 
 #include <Python.h>
diff --git a/src_c/_utils.c b/src_c/_utils.c
@@ -1,4 +1,4 @@
-//# Copyright (c) 2022-2024 Blecic and Cubillos
+// Copyright (c) 2022-2025 Blecic and Cubillos
 // chemcat is open-source software under the GPL-2.0 license (see LICENSE)
 
 #include <Python.h>
diff --git a/src_c/include/ind.h b/src_c/include/ind.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022-2024 Blecic and Cubillos
+// Copyright (c) 2022-2025 Blecic and Cubillos
 // chemcat is open-source software under the GPL-2.0 license (see LICENSE)
 
 // Definitions for indexing Numpy arrays:
diff --git a/src_c/include/newton_raphson.h b/src_c/include/newton_raphson.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022-2024 Blecic and Cubillos
+// Copyright (c) 2022-2025 Blecic and Cubillos
 // chemcat is open-source software under the GPL-2.0 license (see LICENSE)
 
 void usrfun(
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2024 Blecic and Cubillos
+# Copyright (c) 2022-2025 Blecic and Cubillos
 # chemcat is open-source software under the GPL-2.0 license (see LICENSE)
 
 import numpy as np
diff --git a/tests/test_cea.py b/tests/test_cea.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2024 Blecic and Cubillos
+# Copyright (c) 2022-2025 Blecic and Cubillos
 # chemcat is open-source software under the GPL-2.0 license (see LICENSE)
 
 import numpy as np
diff --git a/tests/test_janaf.py b/tests/test_janaf.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2024 Blecic and Cubillos
+# Copyright (c) 2022-2025 Blecic and Cubillos
 # chemcat is open-source software under the GPL-2.0 license (see LICENSE)
 
 import numpy as np
diff --git a/tests/test_network.py b/tests/test_network.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2024 Blecic and Cubillos
+# Copyright (c) 2022-2025 Blecic and Cubillos
 # chemcat is open-source software under the GPL-2.0 license (see LICENSE)
 
 import os
diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2024 Blecic and Cubillos
+# Copyright (c) 2022-2025 Blecic and Cubillos
 # chemcat is open-source software under the GPL-2.0 license (see LICENSE)
 
 import os

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Copyright (c) 2022-2024 Blecic and Cubillos`
	`1`	`+# Copyright (c) 2022-2025 Blecic and Cubillos`
`2`	`2`	`# chemcat is open-source software under the GPL-2.0 license (see LICENSE)`
`3`	`3`
`4`	`4`	`from .cea import *`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@ authors = [`
`21`	`21`	`]`
`22`	`22`
`23`	`23`	`dependencies = [`
`24`		`- 'numpy>=1.23.5',`
`25`		`- 'scipy>=1.5.4',`
`26`		`- 'matplotlib>=3.3.4',`
	`24`	`+ 'numpy>=2.0.0',`
	`25`	`+ 'scipy>=1.13.0',`
	`26`	`+ 'matplotlib>=3.9.2',`
`27`	`27`	`'more-itertools>=8.4.0',`
`28`	`28`	`]`
`29`	`29`