scripts

Author: rene-d

scripts/Dockerfile

@@ -5,8 +5,6 @@ RUN apt-get update && \
     apt-get install -y vim curl wget sudo sqlite3 vim && \
     apt-get install -y build-essential cmake gdb python3-full python3-numpy python3-tabulate python3-click && \
     apt-get install -y clang llvm && \
-    # seems to be mandatory/useful to compile Python 3.x
-    apt-get install -y libssl-dev liblzma-dev libreadline-dev libncursesw5-dev libsqlite3-dev tk-dev libgdbm-dev libgdbm-compat-dev libbz2-dev libffi-dev zlib1g-dev && \
     # dependency for some puzzles
     apt-get install -y z3 && \
     # required to build shapely and numpy, if needed
@@ -21,12 +19,12 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \
     rustup component add rust-src && \
     chmod -R 777 /usr/local/cargo
 
-# Python 3.13
+# Python 3.12
 COPY allpython.sh /
-RUN /allpython.sh 3.13.1
+RUN /allpython.sh 3.12.12
 
 COPY requirements.txt /
-RUN /opt/python/Python-3.13.1/bin/python3.13 -mvenv /venv/python && \
+RUN /opt/python/Python-3.12.12/bin/python3.12 -mvenv /venv/python && \
     /venv/python/bin/pip install -r /requirements.txt
 
 # Golang

scripts/allpython.sh

@@ -2,48 +2,85 @@
 
 set -euo pipefail
 
-# Requirements:
-#   macOS
-#
-#   Debian
-#       apt-get install -y libssl-dev liblzma-dev libreadline-dev libncursesw5-dev libsqlite3-dev tk-dev libgdbm-dev libgdbm-compat-dev libbz2-dev libffi-dev zlib1g-dev
-#   Fedora
-#       dnf install -y openssl-devel libuuid-devel sqlite-devel ncurses-devel bzip2-devel gdbm-devel libffi-devel readline-devel tk-devel
-
 script_dir=$(realpath $(dirname $0))
 
 mkdir -p /opt/python
 
+prerequesites()
+{
+    case $(uname -s) in
+        Darwin)
+            # TODO
+            brew install --quiet tcl-tk
+            ;;
+        Linux)
+            if [[ ! -f /.dockerenv ]] ; then
+                return
+            fi
+
+            if [[ -f /etc/os-release ]] ; then
+                source /etc/os-release
+                case $ID in
+                    debian|ubuntu)
+                        apt-get install -y curl gcc libssl-dev liblzma-dev libreadline-dev libncursesw5-dev libsqlite3-dev tk-dev libgdbm-dev libgdbm-compat-dev libbz2-dev libffi-dev zlib1g-dev libzstd-dev
+                        ;;
+                    fedora)
+                        dnf install -y curl gcc openssl-devel libuuid-devel sqlite-devel ncurses-devel bzip2-devel gdbm-devel libffi-devel readline-devel tk-devel libzstd-devel mpdecimal-devel
+                        ;;
+                    *)
+                        echo "Unknown Linux distro $ID"
+                        exit 1
+                        ;;
+                esac
+            else
+                echo "Unknown Linux distro"
+                exit 1
+            fi
+            ;;
+        *)
+            echo "Unknown system: $(uname -s)"
+            exit 1
+            ;;
+    esac
+
+}
+
 i()
 {
     local v=$1
-
     local b=$(echo $v | cut -f1 -d'a')      # major.minor.micro
     local m=$(echo $v | cut -f1-2 -d'.')    # major.minor
     local url=https://www.python.org/ftp/python/$b/Python-$v.tar.xz
 
+    prerequesites
+
     rm -rf /tmp/Python-$v /opt/python/Python-$v
     curl -sL $url | tar -C /tmp -xJ
     cd /tmp/Python-$v
-    ./configure --prefix=/opt/python/Python-$v --enable-optimizations
+
+    ./configure --prefix=/opt/python/Python-$(sed -E '/\bPY_VERSION\b/s/.*"([0-9.a-z]+)".*/\1/p;d' Include/patchlevel.h) --enable-optimizations
+    echo
+    echo "********************************"
+    cat config.log | grep "^py_cv_module_" | grep -Ev "=yes$"
+    echo "********************************"
+    echo
     ! cat config.log | grep "^py_cv_module_" | grep -Ev "=(yes|n/a)$" | grep -q ^
+
     make -j$(nproc --ignore=1)
     make altinstall
-    # /opt/python/Python-$v/bin/python$m -mensurepip
+
     cd /tmp
     rm -rf /tmp/Python-$v
-
-    if [ -f $script_dir/runall.py ] ; then
-        $script_dir/runall.py --venv /opt/python/Python-$v/bin/python$m
-    fi
 }
 
 a()
 {
-    i 3.10.16
-    i 3.11.11
-    i 3.12.8
-    i 3.13.1
+    # i 3.10.18
+    # i 3.11.14
+    i 3.12.12
+    i 3.13.9
+    i 3.14.0
+    # i 3.15.0a1
 }
 
 if [ ${1-} ]; then

scripts/runall.py

@@ -61,6 +61,7 @@
         "Py3.11": ".venv/py3.11/bin/python3",
         "Py3.12": ".venv/py3.12/bin/python3",
         "Py3.13": ".venv/py3.13/bin/python3",
+        "Py3.14": ".venv/py3.14/bin/python3",
     },
     "JavaScript": {
         "NodeJS": "node",
@@ -665,8 +666,8 @@ def main():
     parser.add_argument("--cache", type=Path, help="cache database")
     parser.add_argument("--working-dir", type=Path, help=argparse.SUPPRESS)
 
-    parser.add_argument("--venv", type=Path, help="create and install virtual environment")
-    parser.add_argument("--reqs", action="store_true", help="install requirements into virtual environments")
+    # parser.add_argument("--venv", type=Path, help="create and install virtual environment")
+    # parser.add_argument("--reqs", action="store_true", help="install requirements into virtual environments")
     parser.add_argument("-c", "--consistency", action="store_true", help="verify duration consistency")
 
     parser.add_argument("-u", "--user", dest="filter_user", metavar="USER", type=str, help="filter by user id")
@@ -895,7 +896,10 @@ def main():
                 for lang1, lang2 in itertools.combinations(languages, 2):
                     n, t1, t2 = 0, 0, 0
                     for y, d in puzzles:
-                        t = dict((lang, t) for (yy, dd, lang), (t, _) in stats_elapsed.items() if (yy, dd) == (y, d))
+
+                        t = dict(
+                            (lang, t) for (yy, dd, dd_str, lang), (t, _) in stats_elapsed.items() if (yy, dd) == (y, d)
+                        )
                         if lang1 in t and lang2 in t:
                             n += 1
                             t1 += t[lang1]