Merge branch 'main' into guomanmin-patch-1

amazon-braket · Mar 4, 2024 · 28527b4 · 28527b4
2 parents c118171 + fe4f9c1
commit 28527b4
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 8 deletions.
diff --git a/.github/workflows/check-format.yml b/.github/workflows/check-format.yml
@@ -17,12 +17,11 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
-        python-version: '3.x'
+        python-version: '3.11'
     - name: Install dependencies
       run: |
         pip install --upgrade pip
-        pip install -e .[test]
+        pip install tox
     - name: Run code format checks
       run: |
-        black --check .
-        flake8
+        tox -e linters_check
diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml
@@ -18,6 +18,8 @@ jobs:
         run: python -m pip install --user --upgrade wheel
       - name: Install twine
         run: python -m pip install --user --upgrade twine
+      - name: Install setuptools
+        run: python -m pip install --user --upgrade setuptools
       - name: Build a binary wheel and a source tarball
         run: python setup.py sdist bdist_wheel
       - name: Publish distribution to PyPI

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -30,5 +30,7 @@ jobs:
       run: |
         tox -e unit-tests
     - name: Upload coverage report to Codecov
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v4
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
       if: ${{ strategy.job-index }} == 0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog
 
+## v1.20.4 (2024-03-04)
+
+### Bug Fixes and Other Changes
+
+ * make the dimension a PositiveInt for typing
+
+## v1.20.3 (2024-03-04)
+
+### Bug Fixes and Other Changes
+
+ * add in setuptools for publishing to pypi
+
+## v1.20.2 (2024-03-02)
+
+### Bug Fixes and Other Changes
+
+ * add tox read only linters
+
 ## v1.20.1 (2023-10-11)
 
 ### Bug Fixes and Other Changes

diff --git a/doc/conf.py b/doc/conf.py
@@ -1,4 +1,5 @@
 """Sphinx configuration."""
+
 import datetime
 
 import pkg_resources

diff --git a/setup.cfg b/setup.cfg
@@ -11,6 +11,7 @@ testpaths = test/unit_tests
 line_length = 100
 multi_line_output = 3
 include_trailing_comma = true
+profile=black
 
 [flake8]
 ignore =

diff --git a/setup.py b/setup.py
@@ -33,7 +33,7 @@
     install_requires=[
         "numpy",
         "opt_einsum",
-        "pydantic>=1.9,<2.0",
+        "pydantic",
         "scipy",
         "sympy",
         # pinned for compatibility with strawberry fields

diff --git a/src/braket/analog_hamiltonian_simulator/rydberg/validators/capabilities_constants.py b/src/braket/analog_hamiltonian_simulator/rydberg/validators/capabilities_constants.py
@@ -13,11 +13,12 @@
 
 from decimal import Decimal
 
+from pydantic import PositiveInt
 from pydantic.main import BaseModel
 
 
 class CapabilitiesConstants(BaseModel):
-    DIMENSIONS = 2
+    DIMENSIONS: PositiveInt = 2
     BOUNDING_BOX_SIZE_X: Decimal
     BOUNDING_BOX_SIZE_Y: Decimal
     MAX_TIME: Decimal

diff --git a/src/braket/default_simulator/_version.py b/src/braket/default_simulator/_version.py
@@ -15,4 +15,4 @@
    Version number (major.minor.patch[-label])
 """
 
-__version__ = "1.20.2.dev0"
+__version__ = "1.20.5.dev0"
diff --git a/tox.ini b/tox.ini
@@ -23,6 +23,19 @@ commands =
     {[testenv:black]commands}
     {[testenv:flake8]commands}
 
+# Read only linter env
+[testenv:linters_check]
+basepython = python3
+skip_install = true
+deps =
+    {[testenv:isort_check]deps}
+    {[testenv:black_check]deps}
+    {[testenv:flake8]deps}
+commands =
+    {[testenv:isort_check]commands}
+    {[testenv:black_check]commands}
+    {[testenv:flake8]commands}
+
 [testenv:flake8]
 basepython = python3
 skip_install = true
@@ -40,6 +53,14 @@ deps =
 commands =
     isort -rc . {posargs} --skip-glob src/braket/default_simulator/openqasm/parser/generated/*
 
+[testenv:isort_check]
+basepython = python3
+skip_install = true
+deps =
+    isort
+commands =
+    isort . -rc {posargs} --skip-glob 'src/braket/default_simulator/openqasm/parser/generated/*'
+
 [testenv:black]
 basepython = python3
 skip_install = true
@@ -48,6 +69,14 @@ deps =
 commands =
     black ./ {posargs}
 
+[testenv:black_check]
+basepython = python3
+skip_install = true
+deps =
+    black
+commands =
+    black --check ./ {posargs}
+
 [testenv:docs]
 basepython = python3
 deps =