Merge pull request #2059 from qutip/dev.major

Merge `dev.major` into master.

.github/workflows/tests.yml

@@ -36,37 +36,29 @@ jobs:
         # the lack of a variable is _always_ false-y, and the defaults lack all
         # the special cases.
         include:
-          # Needs an older version of Python because conda doesn't build old
-          # SciPy versions for Python 3.9.
-          - case-name: MacOS
+          # Mac
+          # Mac has issues with MKL since september 2022.
+          - case-name: macos
             os: macos-latest
-            python-version: "3.9"
+            python-version: "3.10"
+            condaforge: 1
             nomkl: 1
 
-          # Needs an older version of Python because conda doesn't build old
-          # SciPy versions for Python 3.9.
+          # Scipy 1.5
           - case-name: old SciPy
             os: ubuntu-latest
-            python-version: "3.6"
-            scipy-requirement: ">=1.4,<1.5"
-            # let the old SciPy version select an appropriate numpy version:
-            numpy-requirement: ""
-            coverage-requirement: "==6.2"  # last coverage that supported 3.6
+            python-version: "3.8"
+            numpy-requirement: ">=1.20,<1.21"
+            scipy-requirement: ">=1.5,<1.6"
+            condaforge: 1
 
           # No MKL runs.  MKL is now the default for conda installations, but
           # not necessarily for pip.
           - case-name: no MKL
-            os: ubuntu-latest
-            python-version: "3.7"
-            nomkl: 1
-
-          # OpenMP runs.  We only really care about getting OpenMP working
-          # properly on Linux at the moment.
-          - case-name: OpenMP
             os: ubuntu-latest
             python-version: "3.9"
             numpy-requirement: ">=1.20,<1.21"
-            openmp: 1
+            nomkl: 1
 
           # Builds without Cython at runtime.  This is a core feature;
           # everything should be able to run this.
@@ -160,6 +152,7 @@ jobs:
         run: |
           conda list
           python -c "import qutip; qutip.about()"
+          python -c "import qutip; print(qutip.settings)"
 
       - name: Environment information
         run: |
@@ -227,7 +220,7 @@ jobs:
           python -m pip install towncrier
 
       - name: Verify Towncrier entry added
-        if: github.event_name == 'pull_request'
+        if: False # github.event_name == 'pull_request'
         env:
           BASE_BRANCH: ${{ github.base_ref }}
         run: |

.gitignore

@@ -28,10 +28,14 @@ qutip/__config__.py
 rhs*.pyx
 
 qutip/cy/*.c
-qutip/cy/*.cpp
-qutip/control/*.cpp
-qutip/cy/openmp/*.cpp
+*.cpp
 *.dat
+qutip/core/*.h
+
+
+qutip/**/*.html
+qutip/solver/ode/*.c
+
 
 *.qo
 

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011 to 2021 inclusive, QuTiP developers and contributors.
+Copyright (c) 2011 to 2022 inclusive, QuTiP developers and contributors.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

MANIFEST.in

@@ -2,12 +2,11 @@ include README.md
 include LICENSE.txt
 include VERSION
 include requirements.txt
-include qutip.bib
+include CITATION.bib
 include pyproject.toml
 recursive-include qutip *.pyx
 recursive-include qutip *.pxd
-recursive-include qutip *.pxi
 recursive-include qutip *.hpp
 recursive-include qutip *.cpp
 recursive-include qutip *.ini
-recursive-include qutip/tests/qasm_files *.qasm
+recursive-include qutip *.h

VERSION

@@ -1 +1 @@
-4.7.1.dev
+5.0.0.dev

doc/QuTiP_tree_plot/qutip-structure.py

@@ -50,7 +50,7 @@
         "three_level_atom",
     }),
     # QIP
-    ("#36d695", {"qip", "measurement"}),
+    ("#36d695", {"measurement"}),
     # Metrics and distance measures
     ("#ff4500", {"entropy", "metrics", "countstat", "semidefinite"}),
     # Core
@@ -133,12 +133,6 @@ def python_object_tree(module, tree=None, seen=None, root=None, nobjects=0):
             "mesolve" : {
                 "mesolve": <function qutip.mesolve.mesolve(...)>,
             },
-            "qip": {
-                "operations": {
-                    ...
-                },
-                ...
-            },
             ...
         }
     """