Update intel OneAPI compilers (#120)

Update CI

Author: jdhughes-dev

.flake8

@@ -13,10 +13,10 @@ chmod +x webimage.sh
 rm -rf webimage.sh
 WEBIMAGE_NAME=$(ls -1 webimage_extracted/)
 if [ -z "$COMPONENTS" ]; then
-  sudo webimage_extracted/"$WEBIMAGE_NAME"/bootstrapper -s --action install --eula=accept --continue-with-optional-error=yes --log-dir=.
+  sudo webimage_extracted/"$WEBIMAGE_NAME"/bootstrapper -s --action install --eula=accept --log-dir=.
   installer_exit_code=$?
 else
-  sudo webimage_extracted/"$WEBIMAGE_NAME"/bootstrapper -s --action install --components="$COMPONENTS" --eula=accept --continue-with-optional-error=yes --log-dir=.
+  sudo webimage_extracted/"$WEBIMAGE_NAME"/bootstrapper -s --action install --components="$COMPONENTS" --eula=accept --log-dir=.
   installer_exit_code=$?
 fi
 rm -rf webimage_extracted

.github/intel-scripts/install_linux.sh

@@ -10,10 +10,10 @@ COMPONENTS=$2
 curl --output webimage.dmg --url "$URL" --retry 5 --retry-delay 5
 hdiutil attach webimage.dmg
 if [ -z "$COMPONENTS" ]; then
-  sudo /Volumes/"$(basename "$URL" .dmg)"/bootstrapper.app/Contents/MacOS/bootstrapper -s --action install --eula=accept --continue-with-optional-error=yes --log-dir=.
+  sudo /Volumes/"$(basename "$URL" .dmg)"/bootstrapper.app/Contents/MacOS/bootstrapper -s --action install --eula=accept --log-dir=.
   installer_exit_code=$?
 else
-  sudo /Volumes/"$(basename "$URL" .dmg)"/bootstrapper.app/Contents/MacOS/bootstrapper -s --action install --components="$COMPONENTS" --eula=accept --continue-with-optional-error=yes --log-dir=.
+  sudo /Volumes/"$(basename "$URL" .dmg)"/bootstrapper.app/Contents/MacOS/bootstrapper -s --action install --components="$COMPONENTS" --eula=accept --log-dir=.
   installer_exit_code=$?
 fi
 hdiutil detach /Volumes/"$(basename "$URL" .dmg)" -quiet

.github/intel-scripts/install_macos.sh

@@ -9,7 +9,7 @@ curl.exe --output webimage.exe --url %URL% --retry 5 --retry-delay 5
 start /b /wait webimage.exe -s -x -f webimage_extracted --log extract.log
 del webimage.exe
 if "%COMPONENTS%"=="" (
-  webimage_extracted\bootstrapper.exe -s --action install --eula=accept --continue-with-optional-error=yes -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 --log-dir=.
+  webimage_extracted\bootstrapper.exe -s --action install --eula=accept -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 --log-dir=.
 ) else (
-  webimage_extracted\bootstrapper.exe -s --action install --components=%COMPONENTS% --eula=accept --continue-with-optional-error=yes -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 --log-dir=.
+  webimage_extracted\bootstrapper.exe -s --action install --components=%COMPONENTS% --eula=accept -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 --log-dir=.
 )

.github/intel-scripts/install_windows.bat

@@ -27,9 +27,9 @@ jobs:
       run:
         shell: bash
     env:
-      WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17392/w_HPCKit_p_2021.1.0.2682_offline.exe
-      LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17427/l_HPCKit_p_2021.1.0.2684_offline.sh
-      MACOS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17398/m_HPCKit_p_2021.1.0.2681_offline.dmg
+      WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18976/w_HPCKit_p_2022.3.1.19755_offline.exe
+      LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18975/l_HPCKit_p_2022.3.1.16997_offline.sh
+      MACOS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18977/m_HPCKit_p_2022.3.1.15344_offline.dmg
       WINDOWS_FORTRAN_COMPONENTS: intel.oneapi.win.ifort-compiler
       LINUX_FORTRAN_COMPONENTS_WEB: intel.oneapi.lin.ifort-compiler
       MACOS_FORTRAN_COMPONENTS: intel.oneapi.mac.ifort-compiler
@@ -40,7 +40,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2.5.0
+        uses: actions/checkout@v3
 
       - name: Setup Graphviz
         if: runner.os == 'Linux'

.github/workflows/main.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2.5.0
+        uses: actions/checkout@v3
 
       - name: Setup Graphviz on Linux
         if: runner.os == 'Linux'
@@ -71,7 +71,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2.5.0
+        uses: actions/checkout@v3
 
       - name: Setup Graphviz
         uses: ts-graphviz/setup-graphviz@v1
@@ -127,7 +127,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2.5.0
+        uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/[email protected]

.github/workflows/pymake-gcc.yml

@@ -18,7 +18,7 @@ jobs:
     if: github.repository_owner == 'modflowpy'
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2.5.0
+        uses: actions/checkout@v3
 
       - name: Set up Python
         uses: actions/[email protected]
@@ -53,10 +53,10 @@ jobs:
           black --check --diff ./pymake
 
       - name: Run flake8
-        run: flake8 --count --show-source ./pymake
+        run: flake8 --count --show-source --exit-zero ./pymake
 
       - name: Run pylint
-        run: pylint --jobs=0 --errors-only ./pymake
+        run: pylint --jobs=2 --errors-only --exit-zero ./pymake
 
   pymake_setup:
     name: standard installation
@@ -71,7 +71,7 @@ jobs:
 
       # check out repo
       - name: Checkout pymake repo
-        uses: actions/checkout@v2.5.0
+        uses: actions/checkout@v3
 
       - name: Setup Python
         uses: actions/[email protected]

.github/workflows/pymake-linting-install.yml

@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2.5.0
+        uses: actions/checkout@v3
 
       - name: Set up Python
         uses: actions/[email protected]

.github/workflows/pymake-requests.yml

@@ -17,7 +17,7 @@ jobs:
       github.event_name == 'push'
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2.5.0
+        uses: aactions/checkout@v3
 
       - name: Trigger RTDs build
         if: github.ref == 'refs/heads/master'

.github/workflows/pymake-rtd.yml

@@ -60,86 +60,14 @@ confidence=
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use "--disable=all --enable=classes
 # --disable=W".
-disable=print-statement,
-        parameter-unpacking,
-        unpacking-in-except,
-        old-raise-syntax,
-        backtick,
-        long-suffix,
-        old-ne-operator,
-        old-octal-literal,
-        import-star-module-level,
-        non-ascii-bytes-literal,
-        raw-checker-failed,
+disable=raw-checker-failed,
         bad-inline-option,
         locally-disabled,
         file-ignored,
         suppressed-message,
         useless-suppression,
         deprecated-pragma,
-        use-symbolic-message-instead,
-        apply-builtin,
-        basestring-builtin,
-        buffer-builtin,
-        cmp-builtin,
-        coerce-builtin,
-        execfile-builtin,
-        file-builtin,
-        long-builtin,
-        raw_input-builtin,
-        reduce-builtin,
-        standarderror-builtin,
-        unicode-builtin,
-        xrange-builtin,
-        coerce-method,
-        delslice-method,
-        getslice-method,
-        setslice-method,
-        no-absolute-import,
-        old-division,
-        dict-iter-method,
-        dict-view-method,
-        next-method-called,
-        metaclass-assignment,
-        indexing-exception,
-        raising-string,
-        reload-builtin,
-        oct-method,
-        hex-method,
-        nonzero-method,
-        cmp-method,
-        input-builtin,
-        round-builtin,
-        intern-builtin,
-        unichr-builtin,
-        map-builtin-not-iterating,
-        zip-builtin-not-iterating,
-        range-builtin-not-iterating,
-        filter-builtin-not-iterating,
-        using-cmp-argument,
-        eq-without-hash,
-        div-method,
-        idiv-method,
-        rdiv-method,
-        exception-message-attribute,
-        invalid-str-codec,
-        sys-max-int,
-        bad-python3-import,
-        deprecated-string-function,
-        deprecated-str-translate-call,
-        deprecated-itertools-function,
-        deprecated-types-field,
-        next-method-defined,
-        dict-items-not-iterating,
-        dict-keys-not-iterating,
-        dict-values-not-iterating,
-        deprecated-operator-function,
-        deprecated-urllib-function,
-        xreadlines-attribute,
-        deprecated-sys-function,
-        exception-escape,
-        comprehension-escape,
-        C0330
+        use-symbolic-message-instead
 
 
 # Enable the message, report, category or checker with the given id(s). You can
@@ -335,8 +263,8 @@ max-module-lines=1000
 # separator` is used to allow tabulation in dicts, etc.: {1  : 1,\n222: 2}.
 # `trailing-comma` allows a space between comma and closing bracket: (a, ).
 # `empty-line` allows space-only lines.
-no-space-check=trailing-comma,
-               dict-separator
+#no-space-check=trailing-comma,
+#               dict-separator
 
 # Allow the body of a class to be on the same line as the declaration if body
 # contains single statement.

.pylintrc

@@ -51,7 +51,13 @@ def test_latest_assets():
     mfexes_repo_name = "MODFLOW-USGS/executables"
     assets = pymake.get_repo_assets(mfexes_repo_name)
     keys = assets.keys()
-    test_keys = ["mac.zip", "linux.zip", "win32.zip", "win64.zip"]
+    test_keys = [
+        "code.json",
+        "mac.zip",
+        "linux.zip",
+        "win32.zip",
+        "win64.zip",
+    ]
     for key in keys:
         print(f"evaluating the availability of...{key}")
         msg = f"unknown key ({key}) found in github repo assets"

autotest/t999_test.py

@@ -1050,7 +1050,7 @@ def compare_budget(
 
     """
     try:
-        import flopy
+        import flopy  # pylint: disable=import-error
     except:
         msg = "flopy not available - cannot use compare_budget"
         raise ValueError(msg)
@@ -1256,7 +1256,7 @@ def compare_swrbudget(
 
     """
     try:
-        import flopy
+        import flopy  # pylint: disable=import-error
     except:
         msg = "flopy not available - cannot use compare_swrbudget"
         raise ValueError(msg)
@@ -1476,7 +1476,7 @@ def compare_heads(
 
     """
     try:
-        import flopy
+        import flopy  # pylint: disable=import-error
     except:
         msg = "flopy not available - cannot use compare_heads"
         raise ValueError(msg)
@@ -1872,7 +1872,7 @@ def compare_concs(
 
     """
     try:
-        import flopy
+        import flopy  # pylint: disable=import-error
     except:
         msg = "flopy not available - cannot use compare_concs"
         raise ValueError(msg)
@@ -2097,7 +2097,7 @@ def compare_stages(
 
     """
     try:
-        import flopy
+        import flopy  # pylint: disable=import-error
     except:
         msg = "flopy not available - cannot use compare_stages"
         raise ValueError(msg)

pymake/autotest/autotest.py

@@ -39,7 +39,6 @@
     python myscript.py ../src myapp -fc=ifort -cc=icc
 
 """
-import datetime
 import inspect
 import os
 import shutil
@@ -264,7 +263,8 @@ def main(
         # get ordered list of files to compile
         srcfiles = _get_ordered_srcfiles(srcfiles, networkx)
 
-        # set intelwin flag to True in compiling on windows with Intel compilers
+        # set intelwin flag to True in compiling on windows with
+        # Intel compilers
         intelwin = False
         if not meson:
             if _get_osname() == "win32":

pymake/pymake_base.py

@@ -152,7 +152,7 @@ def _get_arg_dict():
         "syslibs": {
             "tag": ("-sl", "--syslibs"),
             "help": """Linker system libraries. Linker libraries should be
-                         enclosed in quotes and start with a blank space or 
+                         enclosed in quotes and start with a blank space or
                          separated from the name (-sl or --syslibs) with a
                          equal sign (-sl='-libgcc'). (default is None)""",
             "default": None,

pymake/pymake_parser.py

@@ -52,28 +52,15 @@ exclude =
     autotest
 ignore =
 # https://flake8.pycqa.org/en/latest/user/error-codes.html
-    F401 # 'module' imported but unused
-# https://pycodestyle.readthedocs.io/en/latest/intro.html#error-codes
-    E121 # continuation line under-indented for hanging indent
-    E122 # continuation line missing indentation or outdented
-    E126 # continuation line over-indented for hanging indent
-    E127 # continuation line over-indented for visual indent
-    E128 # continuation line under-indented for visual indent
-    E203 # whitespace before
-    E221 # multiple spaces before operator
-    E222 # multiple spaces after operator
-    E226 # missing whitespace around arithmetic operator
-    E231 # missing whitespace after ','
-    E241 # multiple spaces after ','
-    E402 # module level import not at top of file
-    E501 # line too long (> 79 characters)
-    E502 # backslash is redundant between brackets
-    E722 # do not use bare 'except'
-    E741 # ambiguous variable name
-    W291 # trailing whitespace
-    W292 # no newline at end of file
-    W293 # blank line contains whitespace
-    W391 # blank line at end of file
-    W503 # line break before binary operator
-    W504 # line break after binary operator
+    # 'module' imported but unused
+    F401
+    # https://pycodestyle.readthedocs.io/en/latest/intro.html#error-codes
+    # do not use bare 'except'
+    E722
+    # ambiguous variable name
+    E741
+    # whitespace before ':'
+    E203
+    # line break before binary operator
+    W503
 statistics = True