subscript 1.6.0__tar.gz → 1.6.1__tar.gz

{subscript-1.6.0 → subscript-1.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: subscript
-Version: 1.6.0
+Version: 1.6.1
 Summary: Equinor's collection of subsurface reservoir modelling scripts
 Author-email: Equinor <rnyb@equinor.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -700,7 +700,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: resdata
 Requires-Dist: res2df
-Requires-Dist: ert>=2.38.0b7
+Requires-Dist: ert
 Requires-Dist: fmu-tools
 Requires-Dist: matplotlib
 Requires-Dist: numpy<2
@@ -730,7 +730,7 @@ Requires-Dist: types-python-dateutil; extra == "tests"
 Provides-Extra: docs
 Requires-Dist: autoapi; extra == "docs"
 Requires-Dist: sphinx; extra == "docs"
-Requires-Dist: sphinx-argparse; extra == "docs"
+Requires-Dist: sphinx-argparse<0.5.0; extra == "docs"
 Requires-Dist: sphinx-autodoc-typehints; extra == "docs"
 Requires-Dist: sphinx-copybutton; extra == "docs"
 Requires-Dist: sphinx-togglebutton; extra == "docs"

{subscript-1.6.0 → subscript-1.6.1}/pyproject.toml

@@ -38,7 +38,7 @@ dynamic = ["version"]
 dependencies = [
     "resdata",
     "res2df",
-    "ert>=2.38.0b7",
+    "ert",
     "fmu-tools",
     "matplotlib",
     "numpy<2",
@@ -72,7 +72,7 @@ tests = [
 docs = [
     "autoapi",
     "sphinx",
-    "sphinx-argparse",
+    "sphinx-argparse<0.5.0",
     "sphinx-autodoc-typehints",
     "sphinx-copybutton",
     "sphinx-togglebutton",

{subscript-1.6.0 → subscript-1.6.1}/src/subscript/legacy/runeclipse

@@ -8,15 +8,26 @@ use Cwd;
 use IO::File;
 
 # ------------------------------------------------------
+my $hostname           = `hostname`;
+my $_balance     = `date +%s`;
 
+$_balance = $_balance % 2;
+my $lisens = "7321\@eclipse1-lic-no.statoil.no:7321\@eclipse2-lic-no.statoil.no";
+if ($_balance == 1) {
+    $lisens = "7321\@eclipse2-lic-no.statoil.no:7321\@eclipse1-lic-no.statoil.no";
+}
+
+if (index($hostname, "stjohn-") == 0) {
+    $lisens = "7321\@stjohn-grid01.stjohn.statoil.no:$lisens";
+} elsif (index($hostname, "rio-") == 0) {
+    $lisens = "7321\@rio-grid01.rio.statoil.no:$lisens";
+}
 
 my $ecldir       = "/prog/res/ecl/grid";
 my $eclolddir    = "/prog/ecl/grid";
 my $ecltestdir   = "/prog/res/ecl/testgrid";
 my $mpiintelroot = "/prog/res/ecl/grid/tools/linux_x86_64/intel/mpi/2018.1.163";
 
-my $lisens = "7321\@eclipse-lic-no.statoil.no";
-
 my $extconfig   = "macros/CONFIG.ECL";
 my $extmpirun64 = "tools/linux_x86_64/mpich_x86_64/bin/mpirun";
 
@@ -73,7 +84,7 @@ my $workdir = cwd;
 my $scriptname = "runeclipse";
 
 my $usage =
-  "usage $scriptname  [-p program] [-q que_name] [-v version] [-x]  [-i] root";
+    "usage $scriptname  [-p program] [-q que_name] [-v version] [-x]  [-i] root";
 
 #
 # Get command line options:
@@ -400,7 +411,7 @@ sub build_batch {
     if ($testversion) {
         print BATCHFIL "echo \"*** RUNNING TEST VERSION $version ****\"\n";
     }
-    print BATCHFIL "export LM_LICENSE_FILE=$lisens\n";
+    print BATCHFIL "export SLBSLS_LICENSE_FILE=$lisens\n";
     print BATCHFIL "export F_UFMTENDIAN=big\n";
     print BATCHFIL "export ARCH=\`uname -m\`\n";
     print BATCHFIL "cd $workdir\n";
@@ -437,7 +448,7 @@ sub build_parallel_batch {
       or die "$scriptname: Cannot create batch file $batchfilename\n";
 
     print BATCHFIL "#!/bin/sh \n";
-    print BATCHFIL "export LM_LICENSE_FILE=$lisens\n";
+    print BATCHFIL "export SLBSLS_LICENSE_FILE=$lisens\n";
 
     #    print BATCHFIL
     #        "export FLEXLM_NO_CKOUT_INSTALL_LIC=1\n" ;

{subscript-1.6.0 → subscript-1.6.1}/src/subscript/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.6.0'
-__version_tuple__ = version_tuple = (1, 6, 0)
+__version__ = version = '1.6.1'
+__version_tuple__ = version_tuple = (1, 6, 1)

{subscript-1.6.0 → subscript-1.6.1}/src/subscript.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: subscript
-Version: 1.6.0
+Version: 1.6.1
 Summary: Equinor's collection of subsurface reservoir modelling scripts
 Author-email: Equinor <rnyb@equinor.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -700,7 +700,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: resdata
 Requires-Dist: res2df
-Requires-Dist: ert>=2.38.0b7
+Requires-Dist: ert
 Requires-Dist: fmu-tools
 Requires-Dist: matplotlib
 Requires-Dist: numpy<2
@@ -730,7 +730,7 @@ Requires-Dist: types-python-dateutil; extra == "tests"
 Provides-Extra: docs
 Requires-Dist: autoapi; extra == "docs"
 Requires-Dist: sphinx; extra == "docs"
-Requires-Dist: sphinx-argparse; extra == "docs"
+Requires-Dist: sphinx-argparse<0.5.0; extra == "docs"
 Requires-Dist: sphinx-autodoc-typehints; extra == "docs"
 Requires-Dist: sphinx-copybutton; extra == "docs"
 Requires-Dist: sphinx-togglebutton; extra == "docs"

{subscript-1.6.0 → subscript-1.6.1}/src/subscript.egg-info/requires.txt

@@ -1,6 +1,6 @@
 resdata
 res2df
-ert>=2.38.0b7
+ert
 fmu-tools
 matplotlib
 numpy<2
@@ -19,7 +19,7 @@ xtgeo
 [docs]
 autoapi
 sphinx
-sphinx-argparse
+sphinx-argparse<0.5.0
 sphinx-autodoc-typehints
 sphinx-copybutton
 sphinx-togglebutton