PyCosmo 2.2.2__tar.gz → 2.3.0__tar.gz

{pycosmo-2.2.2/src/PyCosmo.egg-info → pycosmo-2.3.0}/PKG-INFO

@@ -1,22 +1,21 @@
 Metadata-Version: 2.4
 Name: PyCosmo
-Version: 2.2.2
+Version: 2.3.0
 Summary: A multi-purpose cosmology calculation tool
 Author-email: Uwe Schmitt et al <uwe.schmitt@id.ethz.ch>
-License: GPLv3
+License-Expression: GPL-3.0
 Project-URL: Source, https://cosmo-docs.phys.ethz.ch/PyCosmo
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: C
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Topic :: Scientific/Engineering :: Astronomy
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown; charset=UTF-8
@@ -27,7 +26,7 @@ Requires-Dist: recfast4py>=0.2.3
 Requires-Dist: dill
 Requires-Dist: matplotlib
 Requires-Dist: numba>=0.60
-Requires-Dist: sympy2c>=2.3.1
+Requires-Dist: sympy2c>=2.5.1
 Requires-Dist: numexpr>=2.10
 Requires-Dist: scipy
 Requires-Dist: setuptools>=75.6.0

{pycosmo-2.2.2 → pycosmo-2.3.0}/pyproject.toml

@@ -5,23 +5,22 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "PyCosmo"
-version = "2.2.2"
-license = {text = "GPLv3"}
+version = "2.3.0"
+license = "GPL-3.0"
 description = "A multi-purpose cosmology calculation tool"
 authors = [{name = "Uwe Schmitt et al", email = "uwe.schmitt@id.ethz.ch"}]
 classifiers = [
     "Development Status :: 4 - Beta",
     "Intended Audience :: Developers",
     "Intended Audience :: Science/Research",
-    "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
     "Natural Language :: English",
     "Operating System :: OS Independent",
     "Programming Language :: C",
     "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.9",
     "Topic :: Scientific/Engineering :: Astronomy",
 ]
 
@@ -33,7 +32,7 @@ dependencies = [
     "dill",
     "matplotlib",
     "numba>=0.60",
-    "sympy2c>=2.3.1",
+    "sympy2c>=2.5.1",
     "numexpr>=2.10",
     "scipy",
     "setuptools>=75.6.0",
@@ -59,8 +58,8 @@ dev = [
 ]
 
 docs = [
-    "sphinx < 7",
-    "sphinx-pynpoint-theme",
+    "sphinx",
+    "sphinx-rtd-theme",
     "myst-parser",
 ]
 
@@ -84,25 +83,25 @@ include-package-data = true
 line-length    = 88
 extend-exclude = ["benchmarks/", "*.ipynb"]
 
-    [tool.ruff.format]
-    quote-style           = "double"
-    line-ending           = "lf"
-    docstring-code-format = false
-
-    [tool.ruff.lint]
-    extend-select = [
-        "RUF100",             # unnecessary `noqa` directives
-    ]
-    ignore = [
-        "E501",
-        "E731",               # lambda assignment
-        "E741",               # ambiguous variable name
-    ]
-
-    [tool.ruff.lint.per-file-ignores]
-    '__init__.py' = [
-        "F401",               # imported but unused
-    ]
+[tool.ruff.format]
+quote-style           = "double"
+line-ending           = "lf"
+docstring-code-format = false
+
+[tool.ruff.lint]
+extend-select = [
+    "RUF100",             # unnecessary `noqa` directives
+]
+ignore = [
+    "E501",
+    "E731",               # lambda assignment
+    "E741",               # ambiguous variable name
+]
+
+[tool.ruff.lint.per-file-ignores]
+'__init__.py' = [
+    "F401",               # imported but unused
+]
 
 
 [tool.pytest.ini_options]

{pycosmo-2.2.2 → pycosmo-2.3.0}/src/PyCosmo/NonLinearPerturbationHaloFit.py

@@ -51,7 +51,7 @@ class NonLinearPerturbationHaloFit(NonLinearPerturbationBase):
         k_nl = np.zeros(len(aa))
         for i in range(len(aa)):
             # Delta^2=k ** 3*P(k)/(2 pi ** 2)
-            del2 = self._lin_pert.powerspec_a_k(aa[i], k)[0] * k**3 / 2.0 / np.pi**2
+            del2 = self._lin_pert.powerspec_a_k(aa[i], k)[:, 0] * k**3 / 2.0 / np.pi**2
             # k_nl defined such that Delta^2(k_nl)=1
             k_nl[i] = np.interp(1.0, del2, k)
             if k_nl[i] < 10 ** logk_ran[0] or k_nl[i] > 10 ** logk_ran[1]:

pycosmo-2.2.2/src/PyCosmo/Cosmo.py → pycosmo-2.3.0/src/PyCosmo/cosmo.py

@@ -109,8 +109,7 @@ class Cosmo(object):
         self._pool = None
         self._last_merged = None
 
-        key_0 = "_".join(map(str, sympy2c_version))
-        key_1 = ""
+        equations_file_key = ""
         for i, core_equations_file in enumerate(core_equations_files):
             if not core_equations_file.startswith(
                 "."
@@ -119,7 +118,7 @@ class Cosmo(object):
                 core_equations_files[i] = core_equations_file
 
             with open(core_equations_file, "rb") as fh:
-                key_1 += hashlib.md5(
+                equations_file_key += hashlib.md5(
                     fh.read() + str(self.model_config).encode()
                 ).hexdigest()[:6]
 
@@ -128,7 +127,7 @@ class Cosmo(object):
         print(self.model_config)
         self.params = Bunch({})
 
-        self._cache_file_name = "{}__{}.pkl".format(key_0, key_1)
+        self._cache_file_name = "{}__{}.pkl".format(sympy2c_version, equations_file_key)
         self._load_wrapper()
         self.load_params()