Commit e4705ed5 authored by Callum Attryde's avatar Callum Attryde
Browse files

Merge branch 'windows_ci' into 'develop' 

Windows job

Closes #25

See merge request quantify-os/quantify-scheduler!20
parents 7bdb0543 4c8e98ca

.gitattributes

0 → 100644
+2 −0
Original line number Diff line number Diff line 
* text=auto

.gitlab-ci.yml

+21 −0
Original line number Diff line number Diff line 
.shared_windows_runners:

  tags:

  - shared-windows

  - windows

  - windows-1809



# Official language image. Look for the different tagged releases at:

# https://hub.docker.com/r/library/python/tags/

image: python:3.7
@@ -59,6 +65,21 @@ test-latest: 
  allow_failure: true





test-win-3.8:

  before_script:

    - choco install python --version=3.8.3 -y -f

    - "C:\\Python38\\python.exe -m pip install -U pip"

  extends:

    - .shared_windows_runners

    - test

  script:

    - "C:\\Python38\\python.exe -m pip install -e ."

    - "C:\\Python38\\python.exe -m pip install pytest pytest-runner pytest-cov"

    - "C:\\Python38\\Scripts\\py.test.exe -s --cov=quantify --cov-report xml --cov-report html --cov-report term --cov-config=.coveragerc --color=yes"

  only:

    - develop





flake8:

  image: python:3.7

  stage: Static Analysis

requirements_dev.txt

+0 −2
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ flake8 
coverage

sphinx>=2 # jupyter_sphinx requires sphinx>=2

nbsphinx

scikit-learn==0.23.1

scikit-optimize

sphinx-rtd-theme==0.5.0rc2

sphinxcontrib-blockdiag

jupyter_sphinx==0.3.2

tests/scheduler/backends/test_pulsar_backend.py

+8 −8
Original line number Diff line number Diff line
@@ -100,13 +100,13 @@ def test_overflowing_instruction_times(): 
        }

    }

    program_str = build_q1asm(pulse_timings, pulse_data, len(real), set())

    with open(pathlib.Path(__file__).parent.joinpath('ref_test_large_plays_q1asm'), 'rb') as f:

        assert program_str.encode('utf-8') == f.read()

    with open(pathlib.Path(__file__).parent.joinpath('ref_test_large_plays_q1asm'), 'r') as f:

        assert program_str == f.read()



    pulse_timings.append((229380 + pow(2, 16), 'square_ID', None))

    program_str = build_q1asm(pulse_timings, pulse_data, 524296, set())

    with open(pathlib.Path(__file__).parent.joinpath('ref_test_large_waits_q1asm'), 'rb') as f:

        assert program_str.encode('utf-8') == f.read()

    with open(pathlib.Path(__file__).parent.joinpath('ref_test_large_waits_q1asm'), 'r') as f:

        assert program_str == f.read()





def test_build_q1asm():
@@ -129,12 +129,12 @@ def test_build_q1asm(): 
    }



    program_str = build_q1asm(pulse_timings, pulse_data, 20, set())

    with open(pathlib.Path(__file__).parent.joinpath('ref_test_build_q1asm'), 'rb') as f:

        assert program_str.encode('utf-8') == f.read()

    with open(pathlib.Path(__file__).parent.joinpath('ref_test_build_q1asm'), 'r') as f:

        assert program_str == f.read()



    program_str_sync = build_q1asm(pulse_timings, pulse_data, 30, set())

    with open(pathlib.Path(__file__).parent.joinpath('ref_test_build_q1asm_sync'), 'rb') as f:

        assert program_str_sync.encode('utf-8') == f.read()

    with open(pathlib.Path(__file__).parent.joinpath('ref_test_build_q1asm_sync'), 'r') as f:

        assert program_str_sync == f.read()



    err = r"Provided sequence_duration.*4.*less than the total runtime of this sequence.*20"

    with pytest.raises(ValueError, match=err):