Skip to content

Commit d952339

Browse files
nikolasibalicnikolasibalic
committed
bump version + fix CI
1 parent c65573b commit d952339

13 files changed

Lines changed: 111 additions & 201 deletions

‎.github/workflows/linux.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ jobs:
88
runs-on: ubuntu-latest
99
strategy:
1010
matrix:
11-
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
11+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
1212

1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v4
1515
- name: Set up Python ${{ matrix.python-version }}
16-
uses: actions/setup-python@v2
16+
uses: actions/setup-python@v5
1717
with:
1818
python-version: ${{ matrix.python-version }}
1919
- name: Install dependencies
2020
run: |
2121
python -m pip install --upgrade pip
2222
pip install flake8 pytest black "black[jupyter]"
23-
pip install wheel twine
23+
pip install wheel setuptools twine
2424
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
2525
- name: Check
2626
run: |

‎.github/workflows/mac.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ jobs:
88
runs-on: macos-latest
99
strategy:
1010
matrix:
11-
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
11+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
1212

1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v4
1515
- name: Set up Python ${{ matrix.python-version }}
16-
uses: actions/setup-python@v2
16+
uses: actions/setup-python@v5
1717
with:
1818
python-version: ${{ matrix.python-version }}
1919
- name: Install dependencies
2020
run: |
2121
python -m pip install --upgrade pip
2222
pip install flake8 pytest black "black[jupyter]"
23-
pip install wheel twine
23+
pip install wheel setuptools twine
2424
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
2525
- name: Check
2626
run: |

‎.github/workflows/pypi_linux.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ jobs:
88
deploy:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v2
11+
- uses: actions/checkout@v4
1212
- name: Set up Python
13-
uses: actions/setup-python@v2
13+
uses: actions/setup-python@v5
1414
with:
15-
python-version: '3.9'
15+
python-version: '3.11'
1616
- name: Install dependencies
1717
run: |
1818
python -m pip install --upgrade pip

‎.github/workflows/pypi_macos.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ jobs:
99
runs-on: macos-latest
1010
strategy:
1111
matrix:
12-
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
12+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v4
1515
- name: Set up Python ${{ matrix.python-version }}
16-
uses: actions/setup-python@v2
16+
uses: actions/setup-python@v5
1717
with:
1818
python-version: ${{ matrix.python-version }}
1919
- name: Install dependencies

‎.github/workflows/pypi_windows.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ jobs:
99
runs-on: windows-latest
1010
strategy:
1111
matrix:
12-
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
12+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v4
1515
- name: Set up Python ${{ matrix.python-version }}
16-
uses: actions/setup-python@v2
16+
uses: actions/setup-python@v5
1717
with:
1818
python-version: ${{ matrix.python-version }}
1919
- name: Install dependencies

‎.github/workflows/windows.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: windows-latest
99
strategy:
1010
matrix:
11-
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
11+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
1212

1313
steps:
1414
- uses: actions/checkout@v2
@@ -20,7 +20,7 @@ jobs:
2020
run: |
2121
python -m pip install --upgrade pip
2222
pip install flake8 pytest black "black[jupyter]"
23-
pip install wheel twine
23+
pip install wheel setuptools twine
2424
pip install -r requirements.txt
2525
- name: Check
2626
run: |

‎arc/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# this is automatically parsed by Aphinx module in Python, using napoleon addon
44
from __future__ import division, print_function, absolute_import
55

6-
__version__ = "3.4.0"
6+
__version__ = "3.4.1"
77

88
__all__ = [
99
"AlkaliAtom",

‎arc/alkali_atom_functions.py‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050

5151
DPATH = os.path.join(os.path.expanduser("~"), ".arc-data")
52-
__arc_data_version__ = 10
52+
__arc_data_version__ = 11
5353

5454
__all__ = [
5555
"AlkaliAtom",
@@ -2271,9 +2271,7 @@ def _getRadialQuadrupoleSemiClassical(self, n1, l1, j1, n2, l2, j2, s=0.5):
22712271

22722272
if dl == 0:
22732273
quadrupoleElement = (
2274-
(5.0 / 2.0)
2275-
* nu_c**4
2276-
* (1.0 - (3.0 * l_c**2) / (5 * nu_c**2))
2274+
(5.0 / 2.0) * nu_c**4 * (1.0 - (3.0 * l_c**2) / (5 * nu_c**2))
22772275
)
22782276
for p in range(0, 2, 1):
22792277
sm += gamma ** (2 * p) * q[2 * p]
@@ -3659,13 +3657,11 @@ def getAngular(self, l1, j1, mj1, l2, j2, mj2, s=0.5):
36593657
angularPart = 0.0
36603658
if abs(l1 - l2 - 1) < 0.1:
36613659
angularPart = (
3662-
(l1**2 - ml**2)
3663-
/ ((2.0 * l1 + 1.0) * (2.0 * l1 - 1.0))
3660+
(l1**2 - ml**2) / ((2.0 * l1 + 1.0) * (2.0 * l1 - 1.0))
36643661
) ** 0.5
36653662
elif abs(l1 - l2 + 1) < 0.1:
36663663
angularPart = (
3667-
(l2**2 - ml**2)
3668-
/ ((2.0 * l2 + 1.0) * (2.0 * l2 - 1.0))
3664+
(l2**2 - ml**2) / ((2.0 * l2 + 1.0) * (2.0 * l2 - 1.0))
36693665
) ** 0.5
36703666
sumPart += (
36713667
CG(l1, ml, s, mj1 - ml, j1, mj1)

‎arc/calculations_atom_single.py‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3575,7 +3575,7 @@ def _buildHamiltonian(self, progressOutput=False, debugOutput=False):
35753575
for ii in range(dimension):
35763576
if progressOutput:
35773577
progress += (dimension - ii) * 2 - 1
3578-
print(f"{progress/dimension**2:.0%}", end="\r")
3578+
print(f"{progress / dimension**2:.0%}", end="\r")
35793579

35803580
# add diagonal element
35813581
self.bareEnergies[ii] = (
@@ -3887,7 +3887,7 @@ def diagonalise(
38873887
with it:
38883888
for field, freq in it:
38893889
if progressOutput:
3890-
print(f"{(it.iterindex+1)/it.itersize:.0%}", end="\r")
3890+
print(f"{(it.iterindex + 1) / it.itersize:.0%}", end="\r")
38913891

38923892
# define the Shirley Hamiltonian for this combo of field and frequency
38933893
Hf = self.H0 + self.dT * freq + self.B * field
@@ -3930,11 +3930,13 @@ def diagonalise(
39303930
targetShifts[it.multi_index] = targetEnergy - ev[evInd]
39313931

39323932
if debugOutput:
3933-
print(f"E field {field:.5f} V/m, Freq {freq*1e-9:.3f} GHz")
39343933
print(
3935-
f"Eigenvalue with largest overlap of target state {evInd}: {ev[evInd]*1e-9:.3f} GHz"
3934+
f"E field {field:.5f} V/m, Freq {freq * 1e-9:.3f} GHz"
39363935
)
3937-
print(f"Shift: {(targetEnergy-ev[evInd])*1e-9:.3e} GHz")
3936+
print(
3937+
f"Eigenvalue with largest overlap of target state {evInd}: {ev[evInd] * 1e-9:.3f} GHz"
3938+
)
3939+
print(f"Shift: {(targetEnergy - ev[evInd]) * 1e-9:.3e} GHz")
39383940
print(f"Eigenstate: {egvector[evInd]}")
39393941

39403942
# squeeze out unused dimensions corresponding to single element inputs
@@ -4043,7 +4045,7 @@ def findDipoleCoupledStates(self, debugOutput=False):
40434045
if debugOutput:
40444046
print(f"Found {len(coupledStates):d} dipole coupled states")
40454047
print(
4046-
f"Nearest dipole coupled state is detuned by: {np.abs(self.dipoleCoupledFreqs).min()*1e-9:.3f} GHz"
4048+
f"Nearest dipole coupled state is detuned by: {np.abs(self.dipoleCoupledFreqs).min() * 1e-9:.3f} GHz"
40474049
)
40484050

40494051
def _getRabiFrequency2_broadcast(

‎doc/ARC_3_0_introduction.ipynb‎

Lines changed: 44 additions & 107 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)