Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conventional change log #45

Merged
merged 12 commits into from
Oct 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 6 additions & 6 deletions .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# F403: 'from module import *' used; unable to detect undefined names
# F405: name may be undefined, or defined from star imports: module
# N806: variable in function should be lowercase
ignore=F403,E266,W503,W291,W293
ignore=F403,E266,W503,W291,W293,C901

exclude=
qick/*.py
Expand All @@ -32,11 +32,11 @@ exclude=
# N802 : function name should be lowercase
# N805 : first argument to method should be called 'self'
per-file-ignores =
qickdawg/__init__.py:F401
qickdawg/nvpulsing/__init__.py:F401
qickdawg/fitfunctions/__init__.py:F401
qickdawg/util/__init__.py:F401
src/qickdawg/__init__.py:F401
src/qickdawg/nvpulsing/__init__.py:F401
src/qickdawg/fitfunctions/__init__.py:F401
src/qickdawg/util/__init__.py:F401

# 120 characters is a more agreeable max line length for modern displays
max-line-length=120
max-line-length=127

4 changes: 1 addition & 3 deletions .github/workflows/python-app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,8 @@ jobs:
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
- name: Lint with flake8
run: |
# stop the build if there are Python syntax errors or undefined names
flake8 ./qickdawg --count --select=E9,F63,F7,F82 --show-source --statistics
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
flake8 ./qickdawg --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
flake8 ./src/qickdawg --count --max-complexity=10 --max-line-length=127 --statistics
# - name: Test with pytest
# run: |
# pytest
25 changes: 0 additions & 25 deletions .github/workflows/semantic_release.yaml

This file was deleted.

43 changes: 43 additions & 0 deletions .github/workflows/version_changelog_release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# This workflow will auto-version when pull-requests are merged to main.
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python

name: Version, Changelog, and Release

on:
workflow_dispatch:
push:
branches:
- main

permissions:
contents: write

jobs:
vcr:
runs-on: ubuntu-latest

steps:
- name: Git checkout
uses: actions/checkout@v4
with:
token: ${{ secrets.AMM }}
fetch-depth: 0

- name: Conventional Changelog Action
id: changelog
uses: TriPSs/[email protected]
with:
github-token: ${{ secrets.AMM }}
version-file: 'src/qickdawg/version.json'
release-count: 0
git-message: ${{ github.event.head_commit.message }}

- name: Create Release
uses: actions/create-release@v1
if: ${{ steps.changelog.outputs.skipped == 'false' }}
env:
GITHUB_TOKEN: ${{ secrets.AMM }}
with:
tag_name: ${{ steps.changelog.outputs.tag }}
release_name: ${{ steps.changelog.outputs.tag }}
body: ${{ steps.changelog.outputs.clean_changelog }}
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -162,4 +162,5 @@ cython_debug/

.DS_Store
.docs/html
.docs/doctrees
.docs/doctrees
*test.ipynb
12 changes: 7 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
[build-system]
requires = ["setuptools>=43.0.0", "wheel"]
requires = ["setuptools >= 64.0", "setuptools-scm[toml]>=8.0"]
build-backend = "setuptools.build_meta"


[project]
name = "qickdawg"
dynamic = ["version"]
dependencies = [
"numpy",
"matplotlib",
"pyro4",
"serpent",
"tqdm",
"scipy",
"qick==0.2.160"
"qick==0.2.289"
]
requires-python = ">=3.7"
description = """
Expand All @@ -25,15 +26,16 @@ keywords = ["quantum control", "nitrogen vacancy", "fpga", "xilinx", "rfsoc", "q
authors = [
{name = "Andy Mounce", email = "[email protected]"},
{name = "Emmeline Riendeau", email = "[email protected]"}]
dynamic = ["version"]

[tool.setuptools_scm]

[project.urls]
Documentation = "https://readthedocs.org"
Repository = "https://github.com/sandialabs/qick-dawg.git"
"Bug Tracker" = "https://github.com/sandialabs/qick-dawg/issues"

[tool.semantic_release]
version_variables = ["pyproject.toml:data.project.version"]
[tools.setuptools]
packages = ["qickdawg"]

[tool.setuptools.packages.find]
exclude = ["qick", "graphics*", "installation*", "jupyter_notebooks*"]
54 changes: 0 additions & 54 deletions qick/.github/workflows/update_version.yml

This file was deleted.

39 changes: 0 additions & 39 deletions qick/.github/workflows/wheels.yml

This file was deleted.

73 changes: 0 additions & 73 deletions qick/.gitignore

This file was deleted.

19 changes: 0 additions & 19 deletions qick/.readthedocs.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions qick/CITATION.cff

This file was deleted.

21 changes: 0 additions & 21 deletions qick/LICENSE

This file was deleted.

Loading
Loading