Testing for conflicts

.github/workflows/pre-commit.yml

@@ -3,6 +3,8 @@ name: Run Pre-Commit
 on:
   pull_request: {}
   push:
+    paths-ignore:
+      - 'examples/**'
     branches:
       - dev
       - main

.github/workflows/tox.yml

@@ -0,0 +1,28 @@
+name: Run Tox
+
+on:
+  pull_request: {}
+  push:
+    branches: [main]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        python-version: ['3.8', '3.9', '3.10']
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v3
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip setuptools wheel build
+          python -m pip install tox tox-gh-actions
+      - name: Test with tox
+        run: |
+          tox
+          python -m build .

.gitignore

@@ -131,3 +131,8 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
+
+.pydevproject
+.settings/*
+*data/*
+*.lp

.pre-commit-config.yaml

@@ -21,7 +21,9 @@ repos:
         args:
           - --pytest-test-first
       - id: check-json
+        exclude: examples/
       - id: pretty-format-json
+        exclude: examples/
         args:
           - --autofix
           - --top-keys=_id

.travis.yml

@@ -1,8 +1,8 @@
 language: python
 python:
-  - 3.6
   - 3.7
   - 3.8
+  - 3.9
 before_install:
   - python --version
   - pip install -U pip

examples/Flux Analysis/FullThermodynamicsExample.ipynb

@@ -1373,7 +1373,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.9"
+   "version": "3.9.12"
   }
  },
  "nbformat": 4,