diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index 69c44d20c0..a270746022 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -6,6 +6,9 @@ ### Improvements +* Introduces requirements-dev.txt and improves dockerfile. +[(#330)](https://github.com/PennyLaneAI/pennylane-lightning/pull/330) + ### Documentation ### Bug fixes @@ -14,6 +17,8 @@ This release contains contributions from (in alphabetical order): +Amintor Dusko + --- # Release 0.25.0 diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index d1ef5ccb58..6c180e61db 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -32,9 +32,8 @@ jobs: run: | cd main python -m pip install --upgrade pip - pip install -r requirements.txt + pip install -r requirements-dev.txt pip install matplotlib - pip install git+https://github.com/PennyLaneAI/pennylane.git@master - name: Install lightning.qubit device (master) run: | diff --git a/.github/workflows/tests_linux.yml b/.github/workflows/tests_linux.yml index 6c15acd483..e0030365bb 100644 --- a/.github/workflows/tests_linux.yml +++ b/.github/workflows/tests_linux.yml @@ -230,9 +230,7 @@ jobs: run: | cd main python -m pip install --upgrade pip - pip install -r requirements.txt - pip uninstall pennylane -y - pip install git+https://github.com/PennyLaneAI/pennylane.git + pip install -r requirements-dev.txt - name: Install ML libraries for interfaces run: | @@ -285,9 +283,7 @@ jobs: run: | cd main python -m pip install --upgrade pip - pip install -r requirements.txt - pip uninstall pennylane -y - pip install git+https://github.com/PennyLaneAI/pennylane.git + pip install -r requirements-dev.txt - name: Install ML libraries for interfaces run: | diff --git a/.github/workflows/tests_without_binary.yml b/.github/workflows/tests_without_binary.yml index dd29bdc059..934d5072b0 100644 --- a/.github/workflows/tests_without_binary.yml +++ b/.github/workflows/tests_without_binary.yml @@ -36,9 +36,7 @@ jobs: run: | cd main python -m pip install --upgrade pip - pip install -r requirements.txt - pip uninstall pennylane -y - pip install git+https://github.com/PennyLaneAI/pennylane.git + pip install -r requirements-dev.txt - name: Install lightning.qubit device run: | diff --git a/docker/Dockerfile b/docker/Dockerfile index 2e67eed946..bce3b788a0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -29,8 +29,10 @@ RUN apt-get update \ python3-pip \ python3-venv \ python3-dev \ + gcc-10 g++-10 cpp-10 \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* \ + && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10 --slave /usr/bin/gcov gcov /usr/bin/gcov-10 \ && /usr/sbin/update-ccache-symlinks \ && mkdir /opt/ccache \ && ccache --set-config=cache_dir=/opt/ccache \ @@ -44,12 +46,8 @@ WORKDIR /opt/pennylane-lightning COPY . . RUN pip install --no-cache-dir wheel \ - pytest \ - pytest-cov \ - pytest-mock \ - flaky \ sphinx \ - && pip install --no-cache-dir -r requirements.txt \ + && pip install --no-cache-dir -r requirements-dev.txt \ && pip uninstall -y PennyLane_Lightning \ && make install \ && make test-python \ diff --git a/pennylane_lightning/_version.py b/pennylane_lightning/_version.py index 186ddf83bc..dde0b381dc 100644 --- a/pennylane_lightning/_version.py +++ b/pennylane_lightning/_version.py @@ -16,4 +16,4 @@ Version number (major.minor.patch[-label]) """ -__version__ = "0.26.0-dev" +__version__ = "0.26.0-dev1" diff --git a/requirements-dev.txt b/requirements-dev.txt new file mode 100644 index 0000000000..08be6260f0 --- /dev/null +++ b/requirements-dev.txt @@ -0,0 +1,8 @@ +ninja +flaky +numpy +git+https://github.com/PennyLaneAI/pennylane.git@master +pybind11 +pytest +pytest-cov +pytest-mock diff --git a/requirements.txt b/requirements.txt index f945837dca..de0d3cba80 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ ninja flaky numpy -pennylane>=0.15 +pennylane~=0.25 pybind11 pytest pytest-cov