.github/workflows/pypi-release.yml

@@ -9,13 +9,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-      with:
-        ref: master
+    - name: Checkout
+      uses: actions/checkout@v3
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
-        python-version: '3.8'
+        python-version: '3.9'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
@@ -24,12 +23,9 @@ jobs:
       env:
         TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
         TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
-        TWINE_TEST_PASSWORD: ${{ secrets.PYPI_TEST_API_TOKEN }}
-        TESTPYPI_REPO: https://test.pypi.org/legacy/
         PYPI_REPO: https://upload.pypi.org/legacy/
       run: |
         python setup.py sdist bdist_wheel
-        twine upload --repository-url $TESTPYPI_REPO -u $TWINE_USERNAME -p $TWINE_TEST_PASSWORD dist/*
         twine upload --repository-url $PYPI_REPO dist/*
     # - name: Install pypa/build
     #   run: >-
@@ -44,13 +40,7 @@ jobs:
     #     --sdist
     #     --wheel
     #     --outdir dist/
-    #     .
-    # - name: Publish distribution to Test PyPI
-    #   uses: pypa/gh-action-pypi-publish@master
-    #   with:
-    #     password: ${{ secrets.TEST_PYPI_API_TOKEN }}
-    #     repository_url: https://test.pypi.org/legacy/
     # - name: Publish distribution to PyPI
     #   uses: pypa/gh-action-pypi-publish@master
     #   with:
-    #     password: ${{ secrets.PYPI_API_TOKEN }}
+    #     password: ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/python-test.yml

@@ -1,35 +1,22 @@
-name: Test-code
-# Triggers the workflow on push or pull request events
-on: [push, pull_request]
-
+name: Github Tests
+on: [push] # Can also put pull_request here, but then we dont run it when directly pushing to master
 jobs:
-  # Set the job key. The key is displayed as the job name
-  # when a job name is not provided
-  test-current:
-    # Name the Job
-    name: Testing code base
-    # Set the type of machine to run on
+  build:
     runs-on: ubuntu-latest
-
     steps:
-    # Checks out a copy of your repository on the ubuntu-latest machine
-    - uses: actions/checkout@v2
-    # Runs Setup python action
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.8
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install flake8 pytest
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-    # - name: Lint with flake8
-    #   run: |
-    #     # stop the build if there are Python syntax errors or undefined names
-    #     flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-    #     # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-    #     flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-    - name: Test with pytest
-      run: |
-        pytest
+      - uses: actions/checkout@v3
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+          pip install ".[test, z3, choco, exact, pysat, pysdd, choco, minizinc]"
+          pip install pypblib  # dependency of pysat for PB constraints
+          pip install pytest-xdist
+          sudo snap install minizinc --classic
+      - name: Test with pytest
+        run: |
+          python -m pytest -n 4 tests/

.gitignore

@@ -25,7 +25,7 @@ share/python-wheels/
 .installed.cfg
 *.egg
 MANIFEST
-changelog.md
+.vscode
 # PyInstaller
 #  Usually these files are written by a python script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.
@@ -136,3 +136,13 @@ dmypy.json
 
 # Cython debug symbols
 cython_debug/
+.DS_Store
+bugs/
+
+# Intellij
+.idea/
+
+# VeriPB proof log files (from Glasgow Constraint solver)
+*.veripb
+*.opb
+*.pbp

.readthedocs.yml → .readthedocs.yaml

@@ -2,13 +2,22 @@
 # Read the Docs configuration file
 # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
 
-version: 1
+version: 2
+
+build:
+  os: "ubuntu-22.04"
+  tools:
+    python: "3.7"
 
 python:
-  version: 3.7
   install:
     - requirements: docs/requirements.txt
-
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
-   configuration: docs/conf.py
+  builder: html
+  configuration: docs/conf.py
+  fail_on_warning: false
+
+formats:
+  - pdf
+  - epub