sierra-research 1.3.1__tar.gz → 1.3.5__tar.gz

{sierra-research-1.3.1 → sierra-research-1.3.5}/.github/actions/publish/action.yml

@@ -21,7 +21,7 @@ runs:
     - name: Set tag
       if: github.ref == 'refs/heads/devel'
       shell: bash
-      run: echo "RELEASE_TAG=v$(python3 setup.py --version).beta" >> $GITHUB_ENV
+      run: echo "RELEASE_TAG=$(python3 setup.py --version).beta" >> $GITHUB_ENV
 
     - name: Github beta release
       if: github.ref == 'refs/heads/devel'
@@ -45,7 +45,7 @@ runs:
     - name: Set tag
       if: github.ref == 'refs/heads/master'
       shell: bash
-      run: echo "RELEASE_TAG=v$(python3 setup.py --version)" >> $GITHUB_ENV
+      run: echo "RELEASE_TAG=$(python3 setup.py --version)" >> $GITHUB_ENV
 
     - name: Github release
       if: github.ref == 'refs/heads/master'

{sierra-research-1.3.1 → sierra-research-1.3.5}/.github/actions/sierra-setup/action.yml

@@ -21,26 +21,6 @@ runs:
       with:
         python-version: ${{ matrix.python-version }}
 
-    # - uses: Setup python (ubuntu)
-    #   if: runner.os == 'Linux'
-    #   shell: bash
-    #   run: |
-    #     # apt fails randomly on microsoft's azure servers...
-    #     sudo sed -i 's/azure\.//' /etc/apt/sources.list
-    #     sudo add-apt-repository -y ppa:deadsnakes/ppa
-
-    #     sudo apt-get update
-
-    #     sudo apt-get install python${{ matrix.python-version }} python${{ matrix.python-version }}-dev
-    #     sudo apt-get install python${{ matrix.python-version }}-venv python3-apt
-    #     sudo apt-get install python3-pip python3-cairo intltool python3-wheel strace
-    #     sudo update-alternatives --install /usr/bin/python3 python3 /usr/bin/python${{ matrix.python-version }} 1
-
-    #     # HACK HACK HACK!
-    #     sudo ln -s /usr/lib/python3/dist-packages/apt_pkg.cpython-38-x86_64-linux-gnu.so  /usr/lib/python3/dist-packages/apt_pkg.so
-    #     sudo ln -s /usr/lib/python3/dist-packages/netifaces.cpython-38-x86_64-linux-gnu.so  /usr/lib/python3/dist-packages/netifaces.so
-
-
     - name: Install system deps (ubuntu)
       if: runner.os == 'Linux'
       shell: bash
@@ -61,18 +41,22 @@ runs:
       with:
         python-version: ${{ matrix.python-version }}
 
-    - name: Install system deps (OSX)
-      shell: bash
+    - uses: nick-fields/retry@v2
+      name: Install system deps (OSX)
       if: runner.os == 'macOS'
-      run: |
-        # 2023/01/16: || true needed because homebrew installation of whatever
-        # dependencies these packages requires manual intervention to fix, and I
-        # don't have a mac.
-        brew install parallel pssh ffmpeg || true
-        brew install --cask mactex || true
-        brew install --cask xquartz || true
-        python -m pip install --upgrade pip
-        python -m pip install wheel
+      with:
+        timeout_minutes: 10000
+        max_attempts: 3
+        shell: bash
+        command: |
+          # 2023/01/16: || true needed because homebrew installation of whatever
+          # dependencies these packages requires manual intervention to fix, and I
+          # don't have a mac.
+          brew update && brew install parallel pssh ffmpeg
+          brew update && brew install --cask mactex
+          brew update && brew install --cask xquartz
+          python -m pip install --upgrade pip
+          python -m pip install wheel
 
     ############################################################################
     # SIERRA install

{sierra-research-1.3.1 → sierra-research-1.3.5}/.github/workflows/argos.yml

@@ -24,10 +24,13 @@ jobs:
         with:
           platform: argos
 
-      - name: Integration tests
-        shell: bash
-        run: |
-          ./scripts/argos-integration-tests.sh -f bc_univar_sanity_test
+      - uses: nick-fields/retry@v2
+        name: Integration tests
+        with:
+          timeout_minutes: 3600
+          max_attempts: 3
+          shell: bash
+          command: ./scripts/argos-integration-tests.sh -f bc_univar_sanity_test
 
       - uses: actions/upload-artifact@v3
         with:
@@ -49,10 +52,13 @@ jobs:
         with:
           platform: argos
 
-      - name: Integration tests
-        shell: bash
-        run: |
-          ./scripts/argos-integration-tests.sh -f physics_engines_test
+      - uses: nick-fields/retry@v2
+        name: Integration tests
+        with:
+          timeout_minutes: 3600
+          max_attempts: 3
+          shell: bash
+          command: ./scripts/argos-integration-tests.sh -f physics_engines_test
 
       - uses: actions/upload-artifact@v3
         with:
@@ -73,10 +79,13 @@ jobs:
         with:
           platform: argos
 
-      - name: Integration tests
-        shell: bash
-        run: |
-          ./scripts/argos-integration-tests.sh -f stage1_univar_test
+      - uses: nick-fields/retry@v2
+        name: Integration tests
+        with:
+          timeout_minutes: 3600
+          max_attempts: 3
+          shell: bash
+          command: ./scripts/argos-integration-tests.sh -f stage1_univar_test
 
       - uses: actions/upload-artifact@v3
         with:
@@ -97,10 +106,13 @@ jobs:
         with:
           platform: argos
 
-      - name: Integration tests
-        shell: bash
-        run: |
-          ./scripts/argos-integration-tests.sh -f stage2_univar_test -e hpc.local
+      - uses: nick-fields/retry@v2
+        name: Integration tests
+        with:
+          timeout_minutes: 3600
+          max_attempts: 3
+          shell: bash
+          command: ./scripts/argos-integration-tests.sh -f stage2_univar_test -e hpc.local
 
       - uses: actions/upload-artifact@v3
         with:
@@ -123,10 +135,13 @@ jobs:
         with:
           platform: argos
 
-      - name: Integration tests
-        shell: bash
-        run: |
-          ./scripts/argos-integration-tests.sh -f vc_test
+      - uses: nick-fields/retry@v2
+        name: Integration tests
+        with:
+          timeout_minutes: 3600
+          max_attempts: 3
+          shell: bash
+          command: ./scripts/argos-integration-tests.sh -f vc_test
 
       - uses: actions/upload-artifact@v3
         with:
@@ -148,10 +163,13 @@ jobs:
         with:
           platform: argos
 
-      - name: Integration tests
-        shell: bash
-        run: |
-          ./scripts/argos-integration-tests.sh -f cmdline_test
+      - uses: nick-fields/retry@v2
+        name: Integration tests
+        with:
+          timeout_minutes: 3600
+          max_attempts: 3
+          shell: bash
+          command: ./scripts/argos-integration-tests.sh -f cmdline_test
 
       - uses: actions/upload-artifact@v3
         with:

{sierra-research-1.3.1 → sierra-research-1.3.5}/.github/workflows/coverage.yml

@@ -12,6 +12,10 @@ on:
   schedule:
     - cron: '0 0 1 * *'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   argos-ci:
     uses: ./.github/workflows/argos.yml

{sierra-research-1.3.1 → sierra-research-1.3.5}/.github/workflows/exec-env-plugins.yml

@@ -13,9 +13,7 @@ on:
   #     # - devel
   #   paths:
   #     - 'sierra/**'
-
 jobs:
-
   adhoc:
     runs-on: ${{ inputs.os }}
     strategy:

{sierra-research-1.3.1 → sierra-research-1.3.5}/.github/workflows/sierra-core.yml

@@ -8,7 +8,6 @@ on:
         type: string
 
 jobs:
-
   cmdline-opts:
     runs-on: ${{ inputs.os }}
     strategy:
@@ -24,9 +23,13 @@ jobs:
         with:
           platform: argos
 
-      - name: Cmdline Options
-        run: |
-          ./scripts/core-integration-tests.sh -f cmdline_opts_test
+      - uses: nick-fields/retry@v2
+        name: Cmdline options
+        with:
+          timeout_minutes: 3600
+          max_attempts: 3
+          shell: bash
+          command: ./scripts/core-integration-tests.sh -f cmdline_opts_test
 
       - uses: actions/upload-artifact@v3
         with:
@@ -48,9 +51,13 @@ jobs:
         with:
           platform: argos
 
-      - name: Environment variables
-        run: |
-          ./scripts/core-integration-tests.sh -f env_vars_test
+      - uses: nick-fields/retry@v2
+        name: Environment variables
+        with:
+          timeout_minutes: 3600
+          max_attempts: 3
+          shell: bash
+          command: ./scripts/core-integration-tests.sh -f env_vars_test
 
       - uses: actions/upload-artifact@v3
         with:
@@ -78,14 +85,22 @@ jobs:
           platform: ros1gazebo
           rosdistro: noetic
 
-      - name: Bivariate batch criteria sanity (ARGoS)
-        run: |
-          ./scripts/argos-integration-tests.sh -f bc_bivar_sanity_test
+      - uses: nick-fields/retry@v2
+        name: Bivariate batch criteria sanity (ARGoS)
+        with:
+          timeout_minutes: 3600
+          max_attempts: 3
+          shell: bash
+          command: ./scripts/argos-integration-tests.sh -f bc_bivar_sanity_test
 
-      - name: Bivariate batch criteria sanity (ROS1+Gazebo)
+      - uses: nick-fields/retry@v2
         if: runner.os == 'Linux'
-        run: |
-          ./scripts/ros1gazebo-integration-tests.sh -f bc_bivar_sanity_test
+        name: Bivariate batch criteria sanity (ROS1+Gazebo)
+        with:
+          timeout_minutes: 3600
+          max_attempts: 3
+          shell: bash
+          command: ./scripts/ros1gazebo-integration-tests.sh -f bc_bivar_sanity_test
 
       - uses: actions/upload-artifact@v3
         with:
@@ -113,14 +128,22 @@ jobs:
           platform: ros1gazebo
           rosdistro: noetic
 
-      - name: Bivariate batch criteria stage 1 (ARGoS)
-        run: |
-          ./scripts/argos-integration-tests.sh -f stage1_bivar_test
+      - uses: nick-fields/retry@v2
+        name: Bivariate batch criteria stage 1 (ARGoS)
+        with:
+          timeout_minutes: 3600
+          max_attempts: 3
+          shell: bash
+          command: ./scripts/argos-integration-tests.sh -f stage1_bivar_test
 
-      - name: Bivariate batch criteria stage 1 (ROS1+Gazebo)
+      - uses: nick-fields/retry@v2
         if: runner.os == 'Linux'
-        run: |
-          ./scripts/ros1gazebo-integration-tests.sh -f stage1_bivar_test
+        name: Bivariate batch criteria stage 1 (ROS1+Gazebo)
+        with:
+          timeout_minutes: 3600
+          max_attempts: 3
+          shell: bash
+          command: ./scripts/ros1gazebo-integration-tests.sh -f stage1_bivar_test
 
       - uses: actions/upload-artifact@v3
         with:
@@ -141,10 +164,13 @@ jobs:
         with:
           platform: argos
 
-      - name: Integration tests
-        shell: bash
-        run: |
-          ./scripts/argos-integration-tests.sh -f stage3_univar_test
+      - uses: nick-fields/retry@v2
+        name: Stage3 univariate tests
+        with:
+          timeout_minutes: 3600
+          max_attempts: 3
+          shell: bash
+          command: ./scripts/argos-integration-tests.sh -f stage3_univar_test
 
       - uses: actions/upload-artifact@v3
         with:
@@ -165,10 +191,13 @@ jobs:
         with:
           platform: argos
 
-      - name: Integration tests
-        shell: bash
-        run: |
-          ./scripts/argos-integration-tests.sh -f stage3_bivar_test
+      - uses: nick-fields/retry@v2
+        name: Stage3 bivariate tests
+        with:
+          timeout_minutes: 3600
+          max_attempts: 3
+          shell: bash
+          command: ./scripts/argos-integration-tests.sh -f stage3_bivar_test
 
       - uses: actions/upload-artifact@v3
         with:
@@ -189,10 +218,13 @@ jobs:
         with:
           platform: argos
 
-      - name: Integration tests
-        shell: bash
-        run: |
-          ./scripts/argos-integration-tests.sh -f stage4_univar_test
+      - uses: nick-fields/retry@v2
+        name: Stage4 univariate tests
+        with:
+          timeout_minutes: 3600
+          max_attempts: 3
+          shell: bash
+          command: ./scripts/argos-integration-tests.sh -f stage4_univar_test
 
       - uses: actions/upload-artifact@v3
         with:
@@ -213,10 +245,13 @@ jobs:
         with:
           platform: argos
 
-      - name: Integration tests
-        shell: bash
-        run: |
-          ./scripts/argos-integration-tests.sh -f stage5_univar_test
+      - uses: nick-fields/retry@v2
+        name: Stage5 univariate tests
+        with:
+          timeout_minutes: 3600
+          max_attempts: 3
+          shell: bash
+          command: ./scripts/argos-integration-tests.sh -f stage5_univar_test
 
       - uses: actions/upload-artifact@v3
         with:
@@ -237,10 +272,13 @@ jobs:
         with:
           platform: argos
 
-      - name: Integration tests
-        shell: bash
-        run: |
-          ./scripts/argos-integration-tests.sh -f stage5_bivar_test
+      - uses: nick-fields/retry@v2
+        name: Stage5 univariate tests
+        with:
+          timeout_minutes: 3600
+          max_attempts: 3
+          shell: bash
+          command: ./scripts/argos-integration-tests.sh -f stage5_bivar_test
 
       - uses: actions/upload-artifact@v3
         with:

{sierra-research-1.3.1 → sierra-research-1.3.5}/.github/workflows/static-analysis.yml

@@ -12,6 +12,9 @@ on:
   schedule:
     - cron: '0 0 1 * *'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   analyze:

{sierra-research-1.3.1/sierra_research.egg-info → sierra-research-1.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sierra-research
-Version: 1.3.1
+Version: 1.3.5
 Summary: Automation framework for the scientific method in AI research
 Home-page: https://github.com/jharwell/sierra
 Author: John Harwell

{sierra-research-1.3.1 → sierra-research-1.3.5}/docs/_build/man/sierra-cli.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SIERRA-CLI" "1" "Jan 25, 2023" "1.3.1" "SIERRA"
+.TH "SIERRA-CLI" "1" "Jun 08, 2023" "1.3.5" "SIERRA"
 .SH NAME
 sierra-cli \- The SIERRA Command Line Interface (CLI).
 .

{sierra-research-1.3.1 → sierra-research-1.3.5}/docs/_build/man/sierra-examples.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SIERRA-EXAMPLES" "7" "Jan 25, 2023" "1.3.1" "SIERRA"
+.TH "SIERRA-EXAMPLES" "7" "Jun 08, 2023" "1.3.5" "SIERRA"
 .SH NAME
 sierra-examples \- Examples of SIERRA usage. These examples all assume that you have successfully set up SIERRA with a project of your choice.
 .

{sierra-research-1.3.1 → sierra-research-1.3.5}/docs/_build/man/sierra-exec-envs.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SIERRA-EXEC-ENVS" "7" "Jan 25, 2023" "1.3.1" "SIERRA"
+.TH "SIERRA-EXEC-ENVS" "7" "Jun 08, 2023" "1.3.5" "SIERRA"
 .SH NAME
 sierra-exec-envs \- The execution environments SIERRA supports.
 .

{sierra-research-1.3.1 → sierra-research-1.3.5}/docs/_build/man/sierra-glossary.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SIERRA-GLOSSARY" "7" "Jan 25, 2023" "1.3.1" "SIERRA"
+.TH "SIERRA-GLOSSARY" "7" "Jun 08, 2023" "1.3.5" "SIERRA"
 .SH NAME
 sierra-glossary \- Glossary of SIERRA terminology.
 .

{sierra-research-1.3.1 → sierra-research-1.3.5}/docs/_build/man/sierra-platforms.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SIERRA-PLATFORMS" "7" "Jan 25, 2023" "1.3.1" "SIERRA"
+.TH "SIERRA-PLATFORMS" "7" "Jun 08, 2023" "1.3.5" "SIERRA"
 .SH NAME
 sierra-platforms \- The platforms SIERRA supports, and platform-specific Batch Criteria.
 .

{sierra-research-1.3.1 → sierra-research-1.3.5}/docs/_build/man/sierra-usage.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SIERRA-USAGE" "7" "Jan 25, 2023" "1.3.1" "SIERRA"
+.TH "SIERRA-USAGE" "7" "Jun 08, 2023" "1.3.5" "SIERRA"
 .SH NAME
 sierra-usage \- How to use SIERRA. This covers all non-command line interface aspects.
 .

{sierra-research-1.3.1 → sierra-research-1.3.5}/docs/_build/man/sierra.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SIERRA" "7" "Jan 25, 2023" "1.3.1" "SIERRA"
+.TH "SIERRA" "7" "Jun 08, 2023" "1.3.5" "SIERRA"
 .SH NAME
 sierra \- reSearch pIpEline for Reproducability, Reusability, and Automation.
 .

{sierra-research-1.3.1 → sierra-research-1.3.5}/docs/conf.py

@@ -168,7 +168,6 @@ xref_links = {
                     "https://sierra.readthedocs.io/en/master"),
     "FORDYCA": ("FORDYCA", "https://swarm-robotics-fordyca.readthedocs.io"),
     "PRISM": ("PRISM", "https://swarm-robotics-prism.readthedocs.io"),
-    "LIBRA": ("LIBRA", "https://swarm-robotics-libra.readthedocs.io"),
     "2022-aamas-demo": ("2022 AAMAS Demo",
                         "https://www-users.cse.umn.edu/~harwe006/showcase/aamas-2022-demo")
 
@@ -303,14 +302,16 @@ texinfo_documents = [
 
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'python3': ('https://docs.python.org/3', None),
-                       'numpy': ('https://numpy.org/doc/stable/', None),
-                       'scipy': ('https://docs.scipy.org/doc/scipy/reference', None),
-                       'matplotlib': ('https://matplotlib.org', None),
-                       'sphinx': ('https://www.sphinx-doc.org/en/stable/', None),
-                       'pandas': ('https://pandas.pydata.org/pandas-docs/dev', None),
-                       'implements': ('https://implements.readthedocs.io/en/latest/', None)
-                       }
+intersphinx_mapping = {
+    'python3': ('https://docs.python.org/3', None),
+    'numpy': ('https://numpy.org/doc/stable/', None),
+    'scipy': ('https://docs.scipy.org/doc/scipy/reference', None),
+    'matplotlib': ('https://matplotlib.org', None),
+    'sphinx': ('https://www.sphinx-doc.org/en/stable/', None),
+    'pandas': ('https://pandas.pydata.org/pandas-docs/dev', None),
+    'implements': ('https://implements.readthedocs.io/en/latest/', None),
+    'libra': ('https://libra2.readthedocs.io/en/master', None)
+}
 
 # This is the expected signature of the handler for this event, cf doc
 

{sierra-research-1.3.1 → sierra-research-1.3.5}/docs/src/contributing.rst

@@ -21,8 +21,8 @@ Writing the code
 ----------------
 
 To contribute to the SIERRA core, in you should follow the general workflow and
-python development guide outlined in :xref:`LIBRA`. For the static analysis
-step:
+python development guide outlined in :ref:`ln-libra-python-dev-guide` and
+:ref:`ln-libra-dev-workflow`. For the static analysis step:
 
 #. Install development packages for SIERRA (from the SIERRA repo root)::
 

{sierra-research-1.3.1 → sierra-research-1.3.5}/docs/src/getting_started.rst

@@ -41,6 +41,7 @@ Basic Setup
               - ``texlive-fonts-recommended``
               - ``texlive-latex-extra``
               - ``dvipng``
+              - ``psmisc``
 
               Install the following optional packages with ``apt install``:
 

{sierra-research-1.3.1 → sierra-research-1.3.5}/docs/src/requirements.rst

@@ -16,7 +16,7 @@ OS Requirements
 
 One of the following:
 
-- Recent linux. SIERRA is tested with ubuntu 20.04+, though it will probably
+- Recent linux. SIERRA is tested with Ubuntu 20.04+, though it will probably
   work on less recent versions/other distros as well.
 
 - Recent OSX. SIERRA is tested with OSX 12+, though it *might* work on less
@@ -31,6 +31,12 @@ One of the following:
           If windows support would be helpful for your intended usage of SIERRA,
           please get in touch with me.
 
+Python Requirements
+===================
+
+Python 3.8+. Tested with 3.8-3.9. It may work for newer versions, probably won't
+for older.
+
 .. _ln-sierra-req-exp:
 
 Experimental Definition Requirements
@@ -332,6 +338,19 @@ ROS1+Robot Platform
    verify this by trying to launch a ROS master on each robot: if it launches
    without errors, then these values are setup properly.
 
+.. _ln-sierra-req-models:
+
+============================
+Model Framework Requirements
+============================
+
+When running models during stage 4 (see
+:ref:`ln-sierra-tutorials-project-models`) SIERRA requires that:
+
+- All models return :class:`pandas.DataFrame` (if they don't do this natively,
+  then their python bindings will have to do it). This is enforced by the
+  interfaces models must implement.
+
 .. _ln-sierra-req-xml:
 
 XML Content Requirements

{sierra-research-1.3.1 → sierra-research-1.3.5}/docs/src/trial.rst

@@ -23,6 +23,7 @@ you clone things somewhere else.
               - ``texlive-fonts-recommended``
               - ``texlive-latex-extra``
               - ``dvipng``
+              - ``psmisc``
 
               Install the following optional packages with ``apt install``: