Skip to content

Commit

Permalink
Merge branch 'develop' into 1860-adding-tests-for-the-executor-resour…
Browse files Browse the repository at this point in the history
…ce-deployment-files
  • Loading branch information
Aravind-psiog committed Jan 29, 2024
2 parents 9fb23bb + 8d22e7d commit 978988a
Show file tree
Hide file tree
Showing 117 changed files with 2,178 additions and 1,121 deletions.
19 changes: 18 additions & 1 deletion .github/workflows/boilerplate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,26 @@ jobs:
# See the License for the specific language governing permissions and
# limitations under the License.
boilerplate2024: |-
# Copyright 2024 Agnostiq Inc.
#
# This file is part of Covalent.
#
# Licensed under the Apache License 2.0 (the "License"). A copy of the
# License may be obtained with this software package or at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Use of this file is prohibited except in compliance with the License.
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
run: |
for file in ${{ steps.changed-files.outputs.all_changed_files }}; do
if [[ ! $( cat $file | tr -d '\r' ) =~ "$boilerplate2021" && ! $( cat $file | tr -d '\r' ) =~ "$boilerplate2022" && ! $( cat $file | tr -d '\r' ) =~ "$boilerplate2023" ]] ; then
if [[ ! $( cat $file | tr -d '\r' ) =~ "$boilerplate2021" && ! $( cat $file | tr -d '\r' ) =~ "$boilerplate2022" && ! $( cat $file | tr -d '\r' ) =~ "$boilerplate2023" && ! $( cat $file | tr -d '\r' ) =~ "$boilerplate2024" ]] ; then
printf "Boilerplate is missing from $file.\n"
printf "The first 15 lines of $file are\n\n"
cat $file | tr -d '\r' | cat -ET | head -n 15
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,14 @@ jobs:
--ignore-module=pkg_resources
--ignore-module=covalent/_dispatcher_plugins
--ignore-module=covalent/_shared_files
--ignore-file=covalent/quantum/**
--ignore-file=covalent/_workflow/q*
--ignore-file=covalent/_shared_files/q*
--ignore-file=covalent/_results_manager/q*
--ignore-file=covalent/_shared_files/pickling.py
--ignore-file=covalent/executor/**
--ignore-file=covalent/triggers/**
--ignore-file=covalent/cloud_resource_manager/**
--ignore-file=covalent/quantum/qserver/**
--ignore-file=covalent/_programmatic/**
covalent
Expand Down
19 changes: 19 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@ jobs:
sdk:
- 'covalent/**'
- 'tests/covalent_tests/**'
qelectron:
- 'covalent/executor/quantum_plugins/**'
- 'covalent/executor/qbase.py'
- 'covalent/quantum/**'
- 'tests/qelectron_tests/**'
dispatcher:
- 'covalent_dispatcher/**'
- 'tests/covalent_dispatcher_tests/**'
Expand Down Expand Up @@ -134,6 +139,7 @@ jobs:
echo "NEED_PYTHON=$NEED_PYTHON" >> $GITHUB_ENV
echo "NEED_FRONTEND=$NEED_FRONTEND" >> $GITHUB_ENV
echo "BUILD_AND_RUN_ALL=$BUILD_AND_RUN_ALL" >> $GITHUB_ENV
echo "COVALENT_DISABLE_QELECTRON_TESTS=true" >> $GITHUB_ENV
- name: Set up Python
if: >
Expand All @@ -159,6 +165,7 @@ jobs:
run: |
pip install --no-cache-dir -r ./requirements.txt
pip install --no-cache-dir -r ./tests/requirements.txt
pip install --no-cache-dir -r ./requirements-qelectron.txt
- name: Set up Node
if: env.NEED_FRONTEND || env.BUILD_AND_RUN_ALL
Expand Down Expand Up @@ -252,6 +259,18 @@ jobs:
if: steps.sdk-tests.outcome == 'success'
run: coverage xml -o sdk_coverage.xml

- name: Run Qelectron tests and measure coverage
id: qelectron-tests
if: >
(steps.modified-files.outputs.qelectron == 'true'
|| env.BUILD_AND_RUN_ALL) && env.COVALENT_DISABLE_QELECTRON_TESTS != 'true'
run: PYTHONPATH=$PWD/ pytest -vvs --reruns=5 tests/qelectron_tests/core_tests --cov=covalent_qelectron --cov-config=.coveragerc

- name: Generate Qelectron coverage report
id: qelectron-coverage
if: steps.qelectron-tests.outcome == 'success' && env.COVALENT_DISABLE_QELECTRON_TESTS != 'true'
run: coverage xml -o qelectron_coverage.xml

- name: Run dispatcher tests and measure coverage
id: dispatcher-tests
if: >
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
!pyproject.toml
!requirements.txt
!requirements-client.txt
!requirements-qelectron.txt
!setup.py

# Allow markdown etc
Expand Down
44 changes: 44 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,50 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [UNRELEASED]

### Added

- Added `pennylane` as a requirement in tests due to the tutorials using it

### Changed

- Updated RTD notebooks to fix their behavior
- Changed the error being shown when drawing the transport graph of a lattice to a debug message instead
- Revamped README
- Reorganized `qelectron` tests
- Made qelectron an opt-in feature using `covalent[quantum]` extra

### Removed

- Removed unused file transfer how to guides
- Removed `pennylane` as a requirement from notebooks' requirements.txt as it comes with `covalent`
- Removed `validate_args` and `validate_region` method from `deploy_group` CLI as they were specific to AWS

### Docs

- Added voice cloning tutorial

### Fixed

- Fixed the scenario where any deploy commands would fail if the user had a non deploy compatible plugin installed
- Fixed the SQLAlchemy warning that used to show up at every fresh server start
- Fixed deploy commands' default value of plugins not being propagated to the tfvars file

### Operations

- Added qelectron tests to the `tests` workflow

## [0.233.0-rc.0] - 2024-01-07

### Authors

- Andrew S. Rosen <[email protected]>
- Casey Jao <[email protected]>
- Sankalp Sanand <[email protected]>
- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
- ArunPsiog <[email protected]>
- Co-authored-by: Ara Ghukasyan <[email protected]>


### Added

- Added feature to use custom python files as modules to be used in the electron function
Expand Down
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
include VERSION
include requirements.txt
include requirements-client.txt
include requirements-qelectron.txt
include covalent/py.typed
recursive-include covalent/executor/ *
recursive-include covalent_dispatcher/_service/ *
Expand Down
Loading

0 comments on commit 978988a

Please sign in to comment.