From e9a5082e47fe5bd2328b2fe75dad7fd162c7a9bc Mon Sep 17 00:00:00 2001 From: Alec Edgington <54802828+cqc-alec@users.noreply.github.com> Date: Mon, 22 Apr 2024 11:12:04 +0100 Subject: [PATCH 1/4] Add generated metadata file to git ignore file. (#148) --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0ad9197..17e757b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ dist .hypothesis obj docs/extensions -.ipynb_checkpoints \ No newline at end of file +.ipynb_checkpoints +pytket/extensions/braket/_metadata.py From 6263e2b5c727d198f08e3fd10954e9c8073fab98 Mon Sep 17 00:00:00 2001 From: cqc-melf <70640934+cqc-melf@users.noreply.github.com> Date: Tue, 14 May 2024 17:06:51 +0100 Subject: [PATCH 2/4] update tket email (#149) --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 1ad3a03..9f3028c 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ name="pytket-braket", version=metadata["__extension_version__"], author="TKET development team", - author_email="tket-support@cambridgequantum.com", + author_email="tket-support@quantinuum.com", python_requires=">=3.10", project_urls={ "Documentation": "https://tket.quantinuum.com/extensions/pytket-braket/index.html", From 9c365a9bb8aafae4db2a11034464f92f6cf2a000 Mon Sep 17 00:00:00 2001 From: Alec Edgington <54802828+cqc-alec@users.noreply.github.com> Date: Mon, 3 Jun 2024 12:25:10 +0100 Subject: [PATCH 3/4] Add new issues to project, not Jira (#150) --- .github/workflows/issue-to-project.yml | 16 +++++++++++++ .github/workflows/issue.yml | 33 -------------------------- 2 files changed, 16 insertions(+), 33 deletions(-) create mode 100644 .github/workflows/issue-to-project.yml delete mode 100644 .github/workflows/issue.yml diff --git a/.github/workflows/issue-to-project.yml b/.github/workflows/issue-to-project.yml new file mode 100644 index 0000000..f55a9f0 --- /dev/null +++ b/.github/workflows/issue-to-project.yml @@ -0,0 +1,16 @@ +name: Add issues to project + +on: + issues: + types: + - opened + +jobs: + add-to-project: + name: Add issue to project + runs-on: ubuntu-latest + steps: + - uses: actions/add-to-project@v1.0.1 + with: + project-url: https://github.com/orgs/CQCL-DEV/projects/19 + github-token: ${{ secrets.ADD_TO_PROJECT_PAT }} diff --git a/.github/workflows/issue.yml b/.github/workflows/issue.yml deleted file mode 100644 index bd38bfe..0000000 --- a/.github/workflows/issue.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: New issue - -on: - issues: - types: [opened] - -jobs: - jira_task: - name: Create Jira issue - runs-on: ubuntu-22.04 - steps: - - name: Login - uses: atlassian/gajira-login@v3.0.1 - env: - JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }} - JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }} - JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }} - - name: Create Bug - uses: atlassian/gajira-create@v3.0.1 - if: contains(github.event.issue.labels.*.name, 'bug') - with: - project: TKET - issuetype: Bug - summary: « [pytket-braket] ${{ github.event.issue.title }}» - description: ${{ github.event.issue.html_url }} - - name: Create Task - uses: atlassian/gajira-create@v3.0.1 - if: "! contains(github.event.issue.labels.*.name, 'bug')" - with: - project: TKET - issuetype: Task - summary: « [pytket-braket] ${{ github.event.issue.title }}» - description: ${{ github.event.issue.html_url }} From 30230e4951c41929c07b9937a39e972f70f2ce5c Mon Sep 17 00:00:00 2001 From: Alec Edgington Date: Thu, 6 Jun 2024 12:28:30 +0100 Subject: [PATCH 4/4] mainonly --- .github/workflows/build_and_test.yml | 3 +-- .github/workflows/lint.yml | 1 - README.md | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index f8cdeb7..3584a9c 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -4,10 +4,9 @@ on: pull_request: branches: - main - - develop push: branches: - - develop + - main - 'wheel/**' - 'runci/**' release: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 8af01e0..d80ff50 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -4,7 +4,6 @@ on: pull_request: branches: - main - - develop jobs: lint: diff --git a/README.md b/README.md index 2cfbb3d..388d7f1 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ pip install -e . ## Contributing Pull requests are welcome. To make a PR, first fork the repo, make your proposed -changes on the `develop` branch, and open a PR from your fork. If it passes +changes on the `main` branch, and open a PR from your fork. If it passes tests and is accepted after review, it will be merged in. ### Code style