Revert "update in order to work on bug"

.env.template

@@ -0,0 +1,8 @@
+# Template environment file for building the docs
+# Copy this to .env, then edit all indicated lines
+
+# Documentation Settings
+export DOCS_ROOT="path/to/dysh/docs"    # EDIT ME
+export DOCS_HOST=""                     # EDIT ME
+export DOCS_PORT=""                     # EDIT ME
+alias startdocs="cd $DOCS_ROOT && cd source && sphinx-autobuild . _build -b html --host $DOCS_HOST --port $DOCS_PORT"

.github/workflows/build.yml

@@ -0,0 +1,31 @@
+name: Build with hatch
+
+on:
+  release:
+    types: [created]
+  workflow_dispatch: # needed for "Run" button to show up in action menu
+
+jobs:
+  build:
+    runs-on:  ${{ matrix.os }}
+    environment: hatch build
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        python-version: ["3.x"]
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v3
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements_dev.txt
+        pip install -e .
+    - name: Build with hatch
+      run: |
+        hatch build -c

.github/workflows/hatch-and-pytest.yml

@@ -0,0 +1,40 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
+
+name: Build and Pytest
+
+on:
+  push:
+    branches: [ "main", "release-*", "cat-devel", "mwp-devel", "pedro-devel", "evan-devel" ]
+  pull_request:
+    branches: [ "main", "release-*", "cat-devel", "mwp-devel", "pedro-devel", "evan-devel" ]
+  workflow_dispatch: # needed for "Run" button to show up in action
+jobs:
+  build:
+    runs-on:  ${{ matrix.os }}
+    environment: hatch build
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v3
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install flake8 pytest
+        pip install -r requirements.txt
+        pip install -e .
+    - name: Build with hatch
+      run: |
+        hatch build -c
+    - name: Test with pytest
+      run: |
+        pytest

.github/workflows/pre-commit.yml

@@ -0,0 +1,20 @@
+name: pre-commit
+
+on:
+  pull_request:
+  push:
+    branches: [main, release*]
+
+
+jobs:
+  pre-commit:
+    env:
+      SKIP: ruff
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v4
+      with:
+        # must match the version in .pre-commit-config.yaml:default_language_version.python
+        python-version: '3.9'
+    - uses: pre-commit/[email protected]

.github/workflows/pyinstaller.yml

@@ -0,0 +1,38 @@
+
+name: Package GUI with Pyinstaller
+
+on:
+  push:
+    branches: [ "cat-devel" ]
+  pull_request:
+    branches: [ "cat-devel" ]
+
+jobs:
+  build:
+    runs-on:  ${{ matrix.os }}
+    environment: hatch build
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v3
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt
+          pip install -e .
+      - name: Build with hatch
+        run: |
+          hatch build -c
+      - name: Package GUI with PyInstaller
+        run: |
+          cd gui
+          pyinstaller app.py

.github/workflows/release.yml

@@ -11,22 +11,25 @@ jobs:
     environment: release
     permissions:
       # IMPORTANT: this permission is mandatory for trusted publishing
-      # See: https://github.com/pypa/gh-action-pypi-publish#trusted-publishing
       id-token: write
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        python-version: ["3.x"]
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Python
+    - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v3
       with:
-        python-version: '3.9'  # Should always be the minimum supported Python version
-        cache: 'pip'
-        cache-dependency-path': 'requirements.txt'
+        python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         pip install -r requirements.txt
+        pip install -e .
     - name: Build with hatch
       run: |
-        hatch build --clean
+        hatch build -c
     - name: upload release to PyPI
       uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/workflow.yml

@@ -0,0 +1,16 @@
+name: TestWorkflow
+
+on:
+  release:
+    types: [created]
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Run a one-line script
+        run: echo Hello, world!

.pre-commit-config.yaml

@@ -1,36 +1,39 @@
 ---
 # See https://pre-commit.com for more information
 default_language_version:
-  python: python3.9
+  python: python3.10
 
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: 'https://github.com/pre-commit/pre-commit-hooks'
-    rev: v4.5.0
+    rev: v4.4.0
     hooks:
       - id: trailing-whitespace
         exclude: '(notebooks|attic|benchmark|testdata)/.*'
       - id: end-of-file-fixer
         exclude: LICENSE
       - id: check-yaml
-      - id: check-toml
       - id: check-added-large-files
         args:
           - '--maxkb=1024'
       - id: debug-statements
-      - id: detect-private-key
       - id: mixed-line-ending
         args:
           - '--fix=lf'
       - id: check-docstring-first
-      - id: check-case-conflict # Check for files with names that would conflict on a case-insensitive filesystem
   - repo: https://github.com/pycqa/isort
-    rev: 5.13.2
+    rev: 5.12.0
     hooks:
       - id: isort
         exclude: '(notebooks|attic|benchmark|testdata)/.*'
   - repo: 'https://github.com/psf/black'
-    rev: 23.12.1
+    rev: 23.1.0
     hooks:
       - id: black
         exclude: '(notebooks|attic|benchmark|testdata)/.*'
+#  - repo: https://github.com/jazzband/pip-tools
+#    rev: 6.12.3
+#    hooks:
+#      - id: pip-compile
+#        args:
+#          - '--resolver=backtracking'

README.md

@@ -1,6 +1,4 @@
 [![Documentation Status](https://readthedocs.org/projects/dysh/badge/?version=latest)](https://dysh.readthedocs.io/en/latest/?badge=latest)
-[![pre-commit.ci Status](https://results.pre-commit.ci/badge/github/GreenBankObservatory/dysh/main.svg)](https://results.pre-commit.ci/latest/github/GreenBankObservatory/dysh/main)
-[![CI Workflow Build Status](https://github.com/GreenBankObservatory/dysh/actions/workflows/ci.yml/badge.svg)](https://github.com/GreenBankObservatory/dysh/actions/workflows/ci.yml)
 
 # dysh