Move Aer to it's own package

.github/workflows/build.yml

@@ -79,7 +79,7 @@ jobs:
           CIBW_MANYLINUX_X86_64_IMAGE: "quay.io/pypa/manylinux2010_x86_64:2020-12-03-912b0de"
           CIBW_MANYLINUX_I686_IMAGE: "quay.io/pypa/manylinux2010_i686:2020-12-03-912b0de"
           CIBW_TEST_COMMAND: "python3 {project}/tools/verify_wheels.py"
-          CIBW_TEST_REQUIRES: "git+https://github.com/Qiskit/qiskit-terra.git"
+          CIBW_TEST_REQUIRES: "git+https://github.com/mtreinish/qiskit-cpre@namespace-no-more"
         run: cibuildwheel --output-dir wheelhouse
       - uses: actions/upload-artifact@v2
         with:

.github/workflows/docs.yml

@@ -69,7 +69,7 @@ jobs:
           git clone https://github.com/Qiskit/qiskit-tutorials --depth=1
           python -m pip install --upgrade pip wheel
           pip install -U -r requirements-dev.txt -c constraints.txt
-          pip install -c constraints.txt git+https://github.com/Qiskit/qiskit-terra
+          pip install -c constraints.txt git+https://github.com/mtreinish/qiskit-core@namespace-no-more
           pip install -c constraints.txt .
           pip install -U "qiskit-ibmq-provider" "z3-solver" "qiskit-ignis" "qiskit-aqua" "pyscf<1.7.4" "matplotlib<3.3.0" jupyter pylatexenc sphinx nbsphinx sphinx_rtd_theme cvxpy -c constraints.txt
           python setup.py build_ext --inplace

.github/workflows/tests_linux.yml

@@ -29,14 +29,14 @@ jobs:
         run: |
           set -e
           pip install -U pip wheel
-          pip install -U -c constraints.txt git+https://github.com/Qiskit/qiskit-terra
+          pip install -U -c constraints.txt git+https://github.com/mtreinish/qiskit-core@namespace-no-more
           pip install -U -c constraints.txt -r requirements-dev.txt
         shell: bash
       - name: Run Lint
         run: |
           set -e
-          pycodestyle --ignore=E402,W504 --max-line-length=100 qiskit/providers/aer
-          pylint -j 2 -rn qiskit/providers/aer
+          pycodestyle --ignore=E402,W504 --max-line-length=100 qiskit_aer
+          pylint -j 2 -rn qiskit_aer
   sdist:
     runs-on: ${{ matrix.platform.os }}
     needs: ["lint"]
@@ -76,7 +76,7 @@ jobs:
           set -e
           mkdir out; cd out; virtualenv aer-test
           aer-test/bin/pip install ../dist/*tar.gz
-          aer-test/bin/pip install -c ../constraints.txt git+https://github.com/Qiskit/qiskit-terra
+          aer-test/bin/pip install -c ../constraints.txt git+https://github.com/mtreinish/qiskit-core@namespace-no-more
           aer-test/bin/python ../tools/verify_wheels.py
           aer-test/bin/pip check
         shell: bash
@@ -107,7 +107,7 @@ jobs:
             ${{ runner.os }}-${{ matrix.python-version}}-pip-
             ${{ runner.os }}-${{ matrix.python-version}}-
       - name: Install Deps
-        run: python -m pip install -U -c constraints.txt -r requirements-dev.txt wheel git+https://github.com/Qiskit/qiskit-terra
+        run: python -m pip install -U -c constraints.txt -r requirements-dev.txt wheel git+https://github.com/mtreinish/qiskit-core@namespace-no-more
       - name: Install openblas
         run: |
           set -e

.github/workflows/tests_mac.yml

@@ -29,14 +29,14 @@ jobs:
         run: |
           set -e
           pip install -U pip wheel
-          pip install -U -c constraints.txt git+https://github.com/Qiskit/qiskit-terra
+          pip install -U -c constraints.txt git+https://github.com/mtreinish/qiskit-core@namespace-no-more
           pip install -U -c constraints.txt -r requirements-dev.txt
         shell: bash
       - name: Run Lint
         run: |
           set -e
-          pycodestyle --ignore=E402,W504 --max-line-length=100 qiskit/providers/aer
-          pylint -j 2 -rn qiskit/providers/aer
+          pycodestyle --ignore=E402,W504 --max-line-length=100 qiskit_aer
+          pylint -j 2 -rn qiskit_aer
   sdist:
     runs-on: ${{ matrix.platform.os }}
     needs: ["lint"]
@@ -70,7 +70,7 @@ jobs:
           set -e
           mkdir out; cd out; virtualenv aer-test
           aer-test/bin/pip install ../dist/*tar.gz
-          aer-test/bin/pip install -c ../constraints.txt git+https://github.com/Qiskit/qiskit-terra
+          aer-test/bin/pip install -c ../constraints.txt git+https://github.com/mtreinish/qiskit-core@namespace-no-more
           aer-test/bin/python ../tools/verify_wheels.py
           aer-test/bin/pip check
         shell: bash
@@ -103,7 +103,7 @@ jobs:
       - name: Install Deps
         run: |
           set -e
-          pip install -U -c constraints.txt wheel git+https://github.com/Qiskit/qiskit-terra
+          pip install -U -c constraints.txt wheel git+https://github.com/mtreinish/qiskit-core@namespace-no-more
           pip install -U -c constraints.txt -r requirements-dev.txt
       - name: Install Aer
         run: python -m pip install -U .

.github/workflows/tests_windows.yml

@@ -28,14 +28,14 @@ jobs:
       - name: Install deps
         run: |
           set -e
-          pip install -U -c constraints.txt git+https://github.com/Qiskit/qiskit-terra
+          pip install -U -c constraints.txt git+https://github.com/mtreinish/qiskit-core@namespace-no-more
           pip install -U -c constraints.txt -r requirements-dev.txt
         shell: bash
       - name: Run Lint
         run: |
           set -e
-          pycodestyle --ignore=E402,W504 --max-line-length=100 qiskit/providers/aer
-          pylint -j 2 -rn qiskit/providers/aer
+          pycodestyle --ignore=E402,W504 --max-line-length=100 qiskit_aer
+          pylint -j 2 -rn qiskit_aer
         shell: bash
   tests:
     runs-on: ${{ matrix.os }}
@@ -66,7 +66,7 @@ jobs:
       - name: Add msbuild to PATH
         uses: microsoft/setup-msbuild@v1.0.2
       - name: Install Deps
-        run: python -m pip install -U -c constraints.txt -r requirements-dev.txt wheel git+https://github.com/Qiskit/qiskit-terra
+        run: python -m pip install -U -c constraints.txt -r requirements-dev.txt wheel git+https://github.com/mtreinish/qiskit-core@namespace-no-more
       - name: Install Aer Windows
         run: |
           set -e

.gitignore

@@ -18,7 +18,7 @@ rhs*_op.pyx
 *.whl
 *.egg*
 build/*
-qiskit/providers/aer/backends/libomp.dylib
+*libomp.dylib
 
 # Ignore macOS DS_Store
 .DS_Store

.pylintrc

@@ -295,7 +295,7 @@ ignore-mixin-members=yes
 # (useful for modules/projects where namespaces are manipulated during runtime
 # and thus existing member attributes cannot be deduced by static analysis. It
 # supports qualified module names, as well as Unix pattern matching.
-ignored-modules=matplotlib.cm,numpy.random
+ignored-modules=matplotlib.cm,numpy.random,qiskit.providers
 
 # List of class names for which member attributes should not be checked (useful
 # for classes with dynamically set attributes). This supports the use of

CMakeLists.txt

@@ -9,7 +9,7 @@
 # be linked statically per Apple's indications.
 
 cmake_minimum_required(VERSION 3.8 FATAL_ERROR)
-file(STRINGS "qiskit/providers/aer/VERSION.txt" VERSION_NUM)
+file(STRINGS "qiskit_aer/VERSION.txt" VERSION_NUM)
 
 include(CheckLanguage)
 project(qasm_simulator VERSION ${VERSION_NUM} LANGUAGES CXX C)
@@ -321,7 +321,7 @@ set(AER_LIBRARIES
 set(AER_COMPILER_DEFINITIONS ${AER_COMPILER_DEFINITIONS} ${CONAN_DEFINES})
 if(SKBUILD) # Terra Addon build
 	set(AER_LIBRARIES ${AER_LIBRARIES} AER_DEPENDENCY_PKG::muparserx)
-	add_subdirectory(qiskit/providers/aer/backends/wrappers)
+	add_subdirectory(qiskit_aer/backends/wrappers)
 	add_subdirectory(src/open_pulse)
 else() # Standalone build
 

MANIFEST.in

@@ -1,16 +1,16 @@
 include MANIFEST.in
 include README.md
-recursive-include qiskit *pyx
-recursive-include qiskit *pxd
-recursive-include qiskit *.pxi
-recursive-include qiskit *cpp
-recursive-include qiskit *hpp
+recursive-include qiskit_aer *pyx
+recursive-include qiskit_aer *pxd
+recursive-include qiskit_aer *.pxi
+recursive-include qiskit_aer *cpp
+recursive-include qiskit_aer *hpp
 graft src
 graft contrib
-include qiskit/providers/aer/backends/wrappers/CMakeLists.txt
-include qiskit/providers/aer/backends/wrappers/bindings.cc
-include qiskit/providers/aer/pulse/qutip_extra_lite/cy/CMakeLists.txt
-include qiskit/providers/aer/VERSION.txt
+include qiskit_aer/backends/wrappers/CMakeLists.txt
+include qiskit_aer/backends/wrappers/bindings.cc
+include qiskit_aer/pulse/qutip_extra_lite/cy/CMakeLists.txt
+include qiskit_aer/VERSION.txt
 include CMakeLists.txt
 include cmake/*.cmake
 # Exclude static libraries (they are all compressed with 7z)

docs/apidocs/aer_extensions.rst

@@ -1,6 +1,6 @@
 .. _aer-circuit-extensions:
 
-.. automodule:: qiskit.providers.aer.extensions
+.. automodule:: qiskit_aer.extensions
    :no-members:
    :no-inherited-members:
    :no-special-members:

docs/apidocs/aer_noise.rst

@@ -1,6 +1,6 @@
 .. _aer-noise:
 
-.. automodule:: qiskit.providers.aer.noise
+.. automodule:: qiskit_aer.noise
     :no-members:
     :no-inherited-members:
     :no-special-members:

docs/apidocs/aer_provider.rst

@@ -1,6 +1,6 @@
 .. _aer-provider:
 
-.. automodule:: qiskit.providers.aer
+.. automodule:: qiskit_aer
     :no-members:
     :no-inherited-members:
     :no-special-members:

docs/apidocs/aer_pulse.rst

@@ -1,6 +1,6 @@
 .. _aer-pulse:
 
-.. automodule:: qiskit.providers.aer.pulse
+.. automodule:: qiskit_aer.pulse
     :no-members:
     :no-inherited-members:
     :no-special-members:

docs/apidocs/aer_utils.rst

@@ -1,6 +1,6 @@
 .. _aer-utils:
 
-.. automodule:: qiskit.providers.aer.utils
+.. automodule:: qiskit_aer.utils
     :no-members:
     :no-inherited-members:
     :no-special-members:

qiskit/providers/aer/__init__.py → qiskit_aer/__init__.py

@@ -12,10 +12,10 @@
 
 """
 ==========================================
-Aer Provider (:mod:`qiskit.providers.aer`)
+Aer Provider (:mod:`qiskit_aer`)
 ==========================================
 
-.. currentmodule:: qiskit.providers.aer
+.. currentmodule:: qiskit_aer
 
 Simulator Provider
 ==================
@@ -42,13 +42,6 @@
    :toctree: ../stubs/
 
    AerJob
-
-Exceptions
-==========
-.. autosummary::
-   :toctree: ../stubs/
-
-   AerError
 """
 
 # https://github.com/Qiskit/qiskit-aer/issues/1
@@ -61,14 +54,14 @@
 # ... ¯\_(ツ)_/¯
 
 # pylint: disable=wrong-import-position
-from .aerprovider import AerProvider
-from .aerjob import AerJob
-from .aererror import AerError
-from .backends import *
-from . import pulse
-from . import noise
-from . import utils
-from .version import __version__
+from qiskit_aer.aerprovider import AerProvider
+from qiskit_aer.aerjob import AerJob
+from qiskit_aer.backends import *
+from qiskit_aer import pulse
+from qiskit_aer import noise
+from qiskit_aer import utils
+from qiskit_aer.version import __version__
+from qiskit_aer.exceptions import AerError  # Deprecated
 
 # Global instance to be used as the entry point for convenience.
 Aer = AerProvider()  # pylint: disable=invalid-name

qiskit/providers/aer/aererror.py → qiskit_aer/aererror.py

@@ -14,7 +14,7 @@
 Exception for errors raised by Qiskit Aer simulators backends.
 """
 
-from qiskit import QiskitError
+from qiskit.exceptions import QiskitError
 
 
 class AerError(QiskitError):

qiskit/providers/aer/aerjob.py → qiskit_aer/aerjob.py

@@ -19,7 +19,8 @@
 import logging
 import functools
 
-from qiskit.providers import BaseJob, JobStatus, JobError
+from qiskit.providers.basejob import BaseJob, JobStatus
+from qiskit.providers.exceptions import JobError
 
 logger = logging.getLogger(__name__)
 

qiskit/providers/aer/aerprovider.py → qiskit_aer/aerprovider.py

@@ -14,13 +14,13 @@
 
 """Provider for Qiskit Aer backends."""
 
-from qiskit.providers import BaseProvider
+from qiskit.providers.baseprovider import BaseProvider
 from qiskit.providers.providerutils import filter_backends
 
-from .backends.qasm_simulator import QasmSimulator
-from .backends.statevector_simulator import StatevectorSimulator
-from .backends.unitary_simulator import UnitarySimulator
-from .backends.pulse_simulator import PulseSimulator
+from qiskit_aer.backends.qasm_simulator import QasmSimulator
+from qiskit_aer.backends.statevector_simulator import StatevectorSimulator
+from qiskit_aer.backends.unitary_simulator import UnitarySimulator
+from qiskit_aer.backends.pulse_simulator import PulseSimulator
 
 
 class AerProvider(BaseProvider):

qiskit/providers/aer/backends/__init__.py → qiskit_aer/backends/__init__.py

@@ -14,7 +14,7 @@
 Aer Provider Simulator Backends
 """
 
-from .qasm_simulator import QasmSimulator
-from .statevector_simulator import StatevectorSimulator
-from .unitary_simulator import UnitarySimulator
-from .pulse_simulator import PulseSimulator
+from qiskit_aer.backends.qasm_simulator import QasmSimulator
+from qiskit_aer.backends.statevector_simulator import StatevectorSimulator
+from qiskit_aer.backends.unitary_simulator import UnitarySimulator
+from qiskit_aer.backends.pulse_simulator import PulseSimulator

qiskit/providers/aer/backends/aerbackend.py → qiskit_aer/backends/aerbackend.py

@@ -23,12 +23,12 @@
 from abc import ABC, abstractmethod
 from numpy import ndarray
 
-from qiskit.providers import BaseBackend
+from qiskit.providers.basebackend import BaseBackend
 from qiskit.providers.models import BackendStatus
 from qiskit.result import Result
 
-from ..aerjob import AerJob
-from ..aererror import AerError
+from qiskit_aer.aerjob import AerJob
+from qiskit_aer.aererror import AerError
 
 # Logger
 logger = logging.getLogger(__name__)