[gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/files/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/files/

[Michał Górny]

commit:     fa0bc77060e83768e5e5620fdf6ecbfd6546bd99
Author:     band-a-prend <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Wed Jul 17 15:03:27 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul 19 16:44:56 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa0bc770

sci-libs/cantera: 2.4.0-r1. Fix 'fatal' warning

The SConstruct script contains block that tries to evaluate
'git rev-parse --short HEAD` comand and returns the
"fatal: not a git repository (or any parent up to mount point /var/tmp)"
warning from git command itself if git is installed in system.
It occurs because the release package archive doesn't contain ".git" directory.
This behaviour doesn't affect emerge process but can confuse
in the case of other issues.

Closes: https://bugs.gentoo.org/689998
Signed-off-by: Sergey Torokhov <torokhov_s_a <AT> mail.ru>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sci-libs/cantera/files/cantera_2.4.0_env.patch | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/sci-libs/cantera/files/cantera_2.4.0_env.patch b/sci-libs/cantera/files/cantera_2.4.0_env.patch
index 1be40dfe044..bc018a53f89 100644
--- a/sci-libs/cantera/files/cantera_2.4.0_env.patch
+++ b/sci-libs/cantera/files/cantera_2.4.0_env.patch
@@ -10,7 +10,20 @@ diff -Nur old/cantera-2.4.0/SConstruct new/cantera-2.4.0/SConstruct
                    toolchain=toolchain,
                    **extraEnvArgs)
  
-@@ -1061,7 +1061,7 @@
+@@ -727,11 +727,8 @@
+ env['cantera_pure_version'] = '.'.join(str(x) for x in ctversion.version)
+ env['cantera_short_version'] = '.'.join(str(x) for x in ctversion.version[:2])
+ 
+-try:
+-    env['git_commit'] = getCommandOutput('git', 'rev-parse', '--short', 'HEAD')
+-except Exception:
+-    env['git_commit'] = 'unknown'
++env['git_commit'] = 'unknown'
+ 
+ # Print values of all build options:
+ print("Configuration variables read from 'cantera.conf' and command line:")
+ for line in open('cantera.conf'):
+@@ -1062,7 +1062,7 @@
  
      # Ignore the minor version, e.g. 2.4.x -> 2.4
      env['sundials_version'] = '.'.join(sundials_version.split('.')[:2])

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/files/

[Sam James]

commit:     b2bd34c5505de901634cfe583f956b7ed85da8a4
Author:     Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Mon Jun  6 22:13:21 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun  7 07:44:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2bd34c5

sci-libs/cantera: 2.6.0 fix install for >=dev-python/pip-22.1.1

Closes: https://bugs.gentoo.org/849938

Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/cantera/files/cantera-2.6.0_env.patch | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/sci-libs/cantera/files/cantera-2.6.0_env.patch b/sci-libs/cantera/files/cantera-2.6.0_env.patch
index e49fb4679dd7..15a1e65857e4 100644
--- a/sci-libs/cantera/files/cantera-2.6.0_env.patch
+++ b/sci-libs/cantera/files/cantera-2.6.0_env.patch
@@ -43,6 +43,27 @@ diff -Naur old/SConstruct new/SConstruct
  
  # Print values of all build options:
  # the (updated) "cantera.conf" combines all options that were specified by the user
+diff -Naur old/interfaces/cython/SConscript new/interfaces/cython/SConscript
+--- old/interfaces/cython/SConscript
++++ new/interfaces/cython/SConscript
+@@ -107,7 +107,7 @@
+                               obj, LIBPREFIX="", SHLIBSUFFIX=module_ext,
+                               SHLIBPREFIX="", LIBSUFFIXES=[module_ext])
+ 
+-build_cmd = ("$python_cmd_esc -m pip wheel -v --no-build-isolation --use-feature=in-tree-build --no-deps "
++build_cmd = ("$python_cmd_esc -m pip wheel -v --no-build-isolation --no-deps "
+              "--wheel-dir=build/python/dist build/python")
+ plat = info['plat'].replace('-', '_').replace('.', '_')
+ wheel_name = (f"Cantera-{env['cantera_version']}-cp{py_version_nodot}"
+@@ -172,7 +172,7 @@
+ 
+     install_cmd.append(f"--root={stage_dir.resolve()}")
+ 
+-install_cmd.extend(("--no-build-isolation", "--use-feature=in-tree-build", "--no-deps", "-v", "--force-reinstall",
++install_cmd.extend(("--no-build-isolation", "--no-deps", "-v", "--force-reinstall",
+                     "build/python"))
+ if localenv['PYTHON_INSTALLER'] == 'direct':
+     mod_inst = install(localenv.Command, 'dummy', mod,
 diff -Naur old/test_problems/SConscript new/test_problems/SConscript
 --- old/test_problems/SConscript
 +++ new/test_problems/SConscript

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/files/

[Petr Vaněk]

commit:     2e79846de4197e182ed1b75f47e10c462726aa41
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 10 08:32:37 2024 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Tue Dec 10 08:36:34 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e79846d

sci-libs/cantera: remove unused patch

Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>

 .../files/cantera-3.0.0_enable_python-3.12.patch   | 75 ----------------------
 1 file changed, 75 deletions(-)

diff --git a/sci-libs/cantera/files/cantera-3.0.0_enable_python-3.12.patch b/sci-libs/cantera/files/cantera-3.0.0_enable_python-3.12.patch
deleted file mode 100644
index 8efa7b0df9c5..000000000000
--- a/sci-libs/cantera/files/cantera-3.0.0_enable_python-3.12.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 27f8362f537fc313f8fdb5c07649ef0d92e3b7f6 Mon Sep 17 00:00:00 2001
-From: "Mark E. Fuller" <mark.e.fuller@gmx.de>
-Date: Sat, 26 Aug 2023 01:04:03 +0300
-Subject: [PATCH] mods to enable python3.12
-
----
- .github/workflows/main.yml             | 2 +-
- interfaces/cython/setup.cfg.in         | 1 +
- interfaces/python_minimal/setup.cfg.in | 1 +
- interfaces/python_sdist/setup.cfg.in   | 1 +
- src/base/application.h                 | 2 +-
- 5 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
-index 60822189bb..366ddd8435 100644
---- a/.github/workflows/main.yml
-+++ b/.github/workflows/main.yml
-@@ -65,7 +65,7 @@ jobs:
-     timeout-minutes: 60
-     strategy:
-       matrix:
--        python-version: ['3.8', '3.10', '3.11']
-+        python-version: ['3.8', '3.10', '3.11', '3.12']
-         os: ['ubuntu-20.04', 'ubuntu-22.04']
-       fail-fast: false
-     env:
-diff --git a/interfaces/cython/setup.cfg.in b/interfaces/cython/setup.cfg.in
-index 1a0358a77d..fd3c0b53c4 100644
---- a/interfaces/cython/setup.cfg.in
-+++ b/interfaces/cython/setup.cfg.in
-@@ -27,6 +27,7 @@ classifiers =
-     Programming Language :: Python :: 3.9
-     Programming Language :: Python :: 3.10
-     Programming Language :: Python :: 3.11
-+    Programming Language :: Python :: 3.12
-     Programming Language :: Python :: Implementation :: CPython
-     Topic :: Scientific/Engineering :: Chemistry
-     Topic :: Scientific/Engineering :: Physics
-diff --git a/interfaces/python_minimal/setup.cfg.in b/interfaces/python_minimal/setup.cfg.in
-index 2d96c75eda..753b619ede 100644
---- a/interfaces/python_minimal/setup.cfg.in
-+++ b/interfaces/python_minimal/setup.cfg.in
-@@ -23,6 +23,7 @@ classifiers =
-     Programming Language :: Python :: 3.9
-     Programming Language :: Python :: 3.10
-     Programming Language :: Python :: 3.11
-+    Programming Language :: Python :: 3.12
-     Topic :: Scientific/Engineering :: Chemistry
-     Topic :: Scientific/Engineering :: Physics
- project_urls =
-diff --git a/interfaces/python_sdist/setup.cfg.in b/interfaces/python_sdist/setup.cfg.in
-index 219e53a3f0..e356b422b8 100644
---- a/interfaces/python_sdist/setup.cfg.in
-+++ b/interfaces/python_sdist/setup.cfg.in
-@@ -27,6 +27,7 @@ classifiers =
-     Programming Language :: Python :: 3.9
-     Programming Language :: Python :: 3.10
-     Programming Language :: Python :: 3.11
-+    Programming Language :: Python :: 3.12
-     Programming Language :: Python :: Implementation :: CPython
-     Topic :: Scientific/Engineering :: Chemistry
-     Topic :: Scientific/Engineering :: Physics
-diff --git a/src/base/application.h b/src/base/application.h
-index 76a6c671a2..b03c049f14 100644
---- a/src/base/application.h
-+++ b/src/base/application.h
-@@ -434,7 +434,7 @@ class Application
-     vector<string> inputDirs;
- 
-     //! Versions of Python to consider when attempting to load user extensions
--    vector<string> m_pythonSearchVersions = {"3.11", "3.10", "3.9", "3.8"};
-+    vector<string> m_pythonSearchVersions = {"3.12", "3.11", "3.10", "3.9", "3.8"};
- 
-     //! Set of deprecation warnings that have been emitted (to suppress duplicates)
-     set<string> warnings;