Skip to content

Commit

Permalink
Merge branch 'develop' into 1539-inevitable-recursion-error-from-insi…
Browse files Browse the repository at this point in the history
…de-get_result
  • Loading branch information
ArunPsiog committed Nov 30, 2023
2 parents f81129f + 2e05b04 commit 6283133
Show file tree
Hide file tree
Showing 49 changed files with 1,886 additions and 373 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ name: nightly

on:
schedule:
- cron: "0 0 * * *"
- cron: "*/10 * * * *"

permissions:
id-token: write
contents: read

jobs:
license:
Expand Down Expand Up @@ -131,9 +135,6 @@ jobs:
"AgnostiqHQ/covalent-awslambda-plugin",
"AgnostiqHQ/covalent-braket-plugin",
]
permissions:
id-token: write
contents: read
steps:
- name: Build executor_base_images
uses: peter-evans/repository-dispatch@v2
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ on:
type: string
default: "master"

permissions:
id-token: write
contents: read

env:
PAUL_BLART: >
'['
Expand Down Expand Up @@ -266,9 +270,6 @@ jobs:

docker:
runs-on: ubuntu-latest
permissions:
id-token: write
contents: read
steps:
- name: Check out release tag
uses: actions/checkout@v2
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ jobs:
--ignore-file=covalent/triggers/**
--ignore-file=covalent/cloud_resource_manager/**
--ignore-file=covalent/quantum/qserver/**
--ignore-file=covalent/_programmatic/**
covalent
- name: Check missing dispatcher requirements
Expand Down
63 changes: 3 additions & 60 deletions .github/workflows/test_matrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
"experimental": false,
"trigger": [
"schedule",
"workflow_dispatch",
"pull_request"
"workflow_dispatch"
]
},
{
Expand Down Expand Up @@ -74,9 +73,9 @@
"experimental": false,
"trigger": [
"push",
"pull_request",
"schedule",
"workflow_dispatch"
"workflow_dispatch",
"pull_request"
]
},
{
Expand Down Expand Up @@ -178,62 +177,6 @@
"workflow_dispatch"
]
},
{
"name": "CentOS 7 / Python 3.8 / Dask",
"os": "ubuntu-latest",
"container": {
"image": "ghcr.io/agnostiqhq/covalent-dev/centos7-py38:latest",
"options": "--user root"
},
"backend": "dask",
"experimental": false,
"trigger": [
"schedule",
"workflow_dispatch"
]
},
{
"name": "CentOS 7 / Python 3.8 / Local",
"os": "ubuntu-latest",
"container": {
"image": "ghcr.io/agnostiqhq/covalent-dev/centos7-py38:latest",
"options": "--user root"
},
"backend": "local",
"experimental": false,
"trigger": [
"schedule",
"workflow_dispatch"
]
},
{
"name": "CentOS 7 / Python 3.9 / Dask",
"os": "ubuntu-latest",
"container": {
"image": "ghcr.io/agnostiqhq/covalent-dev/centos7-py39:latest",
"options": "--user root"
},
"backend": "dask",
"experimental": false,
"trigger": [
"schedule",
"workflow_dispatch"
]
},
{
"name": "CentOS 7 / Python 3.9 / Local",
"os": "ubuntu-latest",
"container": {
"image": "ghcr.io/agnostiqhq/covalent-dev/centos7-py39:latest",
"options": "--user root"
},
"backend": "local",
"experimental": false,
"trigger": [
"schedule",
"workflow_dispatch"
]
},
{
"name": "MacOS 11 / Python 3.8 / Dask",
"os": "macos-latest",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ jobs:
if: >
steps.modified-files.outputs.dispatcher == 'true'
|| env.BUILD_AND_RUN_ALL
run: PYTHONPATH=$PWD/ pytest -vvs --reruns=5 tests/covalent_dispatcher_tests --cov=covalent_dispatcher --cov-config=.coveragerc
run: PYTHONPATH=$PWD/ pytest -vvs --reruns=5 tests/covalent_dispatcher_tests --cov=covalent_dispatcher --cov-config=.coveragerc

- name: Generate dispatcher coverage report
id: dispatcher-coverage
Expand Down
70 changes: 70 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,67 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

- Terraform output to use scrolling buffer.
- Terraform output handling to show errors.

## [0.231.0-rc.0] - 2023-11-28

### Authors

- Ara Ghukasyan <[email protected]>
- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

### Added

- check for `/bin/bash` AND `/bin/sh` (in that order) to execute bash leptons

### Changed

- Changed the axios version on the webapp side.

### Operations

- Change the strict version pin on `pennylane` from `==0.33.1` to `>=0.31.1,<0.33.0`

## [0.230.0-rc.0] - 2023-11-24

### Authors

- Andrew S. Rosen <[email protected]>
- Co-authored-by: Will Cunningham <[email protected]>
- Co-authored-by: Sankalp Sanand <[email protected]>
- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
- Kevin Taylor <[email protected]>
- FilipBolt <[email protected]>
- Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
- Co-authored-by: Will Cunningham <[email protected]>
- Co-authored-by: Prasy12 <[email protected]>
- Co-authored-by: Ara Ghukasyan <[email protected]>
- Aviral Katiyar <[email protected]>
- Co-authored-by: ArunPsiog <[email protected]>
- Casey Jao <[email protected]>
- Arnav Kohli <[email protected]>
- Kirill Pushkarev <[email protected]>
- Aditya Raj Kashyap <[email protected]>
- ArunPsiog <[email protected]>
- mpvgithub <[email protected]>
- Aravind <[email protected]>
- Faiyaz Hasan <[email protected]>
- Co-authored-by: Venkat Bala <[email protected]>
- Co-authored-by: kessler-frost <[email protected]>
- Co-authored-by: Aravind-psiog <[email protected]>
- Co-authored-by: Manjunath PV <[email protected]>
- Co-authored-by: Ara Ghukasyan <[email protected]>
- Co-authored-by: Alejandro Esquivel <[email protected]>



### Added

- Programmatic equivalents of CLI commands `covalent start` and `covalent stop`

### Changed

- Changed the azurebatch.rst banner from default covalent jpg to azure batch's svg file

### Fixed
Expand All @@ -23,6 +84,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Changed code at line 218 in covalent/_shared_files/utils.py
- Fixed usage of deprecated pydantic validation methods
- Fixed qelectron_db retrieval in result object
- Fixed editability of Qelectron on settings page - UI changes
- Certain pydantic v2 related updates
- Fixed lattice's metadata propagation to electron's metadata in case no metadata was provided to the electron
- Handled RecursionError on get results for a long running workflow

### Operations
Expand All @@ -35,6 +99,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Changed semver from 5.7.1 to 5.7.2 in package.json
- Updated word-wrap to 1.2.4 version
- Updated the nightly workflow's schedule
- Temporarily making the nightly workflow more frequent to test the fix for the failing tests
- Fixed failing tests

### Changed

Expand All @@ -44,6 +110,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Improved error handling in generate_docs.py
- [Significant Changes] Migrated core server-side code to new data access layer.
- Changed the way UI was accessing the qelectron database to access it directly from the mdb file in object store
- Update version of browserverify-sign
- Limiting cloudpickle version to less than 3.0 for now

### Added

Expand All @@ -52,6 +120,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- New Runner and executor API to bypass server-side memory when running tasks.
- Added qelectron_db as an asset to be transferred from executor's machine to covalent server
- New methods to qelectron_utils, replacing the old ones
- Covalent deploy CLI tool added - allows provisioning infras directly from covalent

### Docs

Expand All @@ -63,6 +132,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Temporarily skipping the sqlite and database trigger functional tests
- Updated tests to accommodate the new qelectron fixes
- Added new tests for the Database class and qelectron_utils
- Covalent deploy CLI tool tests.

### Removed

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.229.0-rc.0
0.231.0-rc.0
5 changes: 5 additions & 0 deletions covalent/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@
from ._dispatcher_plugins import local_redispatch as redispatch # nopycln: import
from ._dispatcher_plugins import stop_triggers # nopycln: import
from ._file_transfer import strategies as fs_strategies # nopycln: import
from ._programmatic.commands import ( # nopycln: import
covalent_start,
covalent_stop,
is_covalent_running,
)
from ._results_manager.results_manager import ( # nopycln: import
cancel,
get_result,
Expand Down
20 changes: 20 additions & 0 deletions covalent/_programmatic/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Copyright 2021 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.

"""
NOTE: This package exists to avoid circular imports that would be encountered if
`covalent` imports from `covalent_dispatcher._cli`.
"""
Loading

0 comments on commit 6283133

Please sign in to comment.