From 5ccbee2d88f33ba97be8abcc0f0939cb52165207 Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Thu, 2 Jun 2022 23:07:08 -0700 Subject: [PATCH 01/42] cleaning up build to be updated to current pep standards --- broadbean/_version.py | 12 ++++++++++++ pyproject.toml | 41 +++++++++++++++++++++++++++++++++++++++++ setup.cfg | 40 ++++++++++++++++++++++++++++++++++++++++ setup.py | 43 +++++-------------------------------------- 4 files changed, 98 insertions(+), 38 deletions(-) create mode 100644 broadbean/_version.py create mode 100644 setup.cfg diff --git a/broadbean/_version.py b/broadbean/_version.py new file mode 100644 index 000000000..313f76373 --- /dev/null +++ b/broadbean/_version.py @@ -0,0 +1,12 @@ +def _get_version() -> str: + from pathlib import Path + import versioningit + import broadbean + + project_dir = Path(qdwsdk.__file__).parent.parent + if not (project_dir / "pyproject.toml").exists(): + project_dir = project_dir.parent + return versioningit.get_version(project_dir=project_dir) + + +__version__ = _get_version() \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 50c55b6d4..23c6eeae4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,16 @@ + +[build-system] +requires = [ + "setuptools >= 56.0", + "wheel >= 0.29.0", + "versioningit ~= 1.1.0", +] +build-backend = 'setuptools.build_meta' + +[tool.pytest.ini_options] +junit_family = "legacy" +addopts = "--strict-markers" + [tool.mypy] ignore_missing_imports = true show_error_codes = true @@ -5,3 +18,31 @@ enable_error_code = "ignore-without-code" warn_unused_ignores = true warn_unused_configs = true warn_redundant_casts = true + +[[tool.mypy.overrides]] +module = [ + "broadbean.tests.*", +] +disallow_untyped_defs = false + +[tool.versioningit] +default-version = "0.0" + +[tool.versioningit.format] +distance = "{next_version}.dev{distance}+{branch}.{vcs}{rev}" +dirty = "{version}" +# At the moment, before releasing via making a Git tag we need to change a line +# in ``conf.ini`` file that's part of the package, which makes the repo "dirty", +# which in turn makes versioningit use the "dirty" version format, while what +# we need is the "clean" part only. As a workaround, for "dirty" situations, +# we now ask versioningit to only use ``version``. +distance-dirty = "{next_version}.dev{distance}+{branch}.{vcs}{rev}.dirty" + +[tool.versioningit.vcs] +method = "git" +match = ["v*"] + +[tool.versioningit.onbuild] +source-file = "broadbean/_version.py" +build-file = "broadbean/_version.py" + diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 000000000..15995ccc7 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,40 @@ +[metadata] +name = broadbean +version = 0.10.0 +maintainer = QCoDeS Core Developers +maintainer_email = qcodes-support@microsoft.com +description = Package for easily generating and manipulating signal + pulses. Developed for use with qubits in the quantum + computing labs of Copenhagen, Delft, and Sydney, but + should be generally useable +keywords = Pulsebuilding signal processing arbitrary waveforms +long_description = file: README.md +long_description_content_type = text/markdown +url = https://github.com/QCoDeS/broadbean +classifiers = + Development Status :: 4 - Beta + Intended Audience :: Science/Research + License :: OSI Approved :: MIT License + Programming Language :: Python :: 3 :: Only + Programming Language :: Python :: 3.7 + Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 + Topic :: Scientific/Engineering + +license = MIT +python_requires = >=3.7 +# We might as well require what we know will work +# although older numpy and matplotlib version will probably work too +install_requires = + numpy>=1.12.1 + matplotlib + schema + setuptools>=48 + versioningit>=1.1.0 + +[options] +include_package_data = True +package_dir= + =broadbean +packages=find: \ No newline at end of file diff --git a/setup.py b/setup.py index 6198f5921..60e43e589 100644 --- a/setup.py +++ b/setup.py @@ -1,40 +1,7 @@ from setuptools import setup +from versioningit import get_cmdclasses -setup( - name='broadbean', - version='0.10.0', - - # We might as well require what we know will work - # although older numpy and matplotlib version will probably work too - install_requires=['numpy>=1.12.1', - 'matplotlib', - 'schema'], - - author='William H.P. Nielsen', - author_email='William.Nielsen@microsoft.com', - - description=("Package for easily generating and manipulating signal " - "pulses. Developed for use with qubits in the quantum " - "computing labs of Copenhagen, Delft, and Sydney, but " - "should be generally useable."), - - license='MIT', - - packages=['broadbean'], - - classifiers=[ - 'Development Status :: 4 - Beta', - 'Intended Audience :: Science/Research', - 'Programming Language :: Python :: 3 :: Only', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Programming Language :: Python :: 3.10' - ], - - python_requires=">=3.7", - - keywords='Pulsebuilding signal processing arbitrary waveforms', - - url='https://github.com/QCoDeS/broadbean' - ) +if __name__ == "__main__": + setup( + cmdclass=get_cmdclasses(), + ) \ No newline at end of file From 22aa4b59b958253755a72a01df3c75e49bd1b548 Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Thu, 2 Jun 2022 23:45:43 -0700 Subject: [PATCH 02/42] update setup.cfg package_dir --- setup.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 15995ccc7..06e980719 100644 --- a/setup.cfg +++ b/setup.cfg @@ -36,5 +36,5 @@ install_requires = [options] include_package_data = True package_dir= - =broadbean -packages=find: \ No newline at end of file + =. +packages=find: From 65cceedbb52b87873eb990e36f0957adcc69bbc4 Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Thu, 2 Jun 2022 23:51:56 -0700 Subject: [PATCH 03/42] more setup,cfg updates --- setup.cfg | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/setup.cfg b/setup.cfg index 06e980719..457743028 100644 --- a/setup.cfg +++ b/setup.cfg @@ -21,8 +21,18 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Topic :: Scientific/Engineering - license = MIT + +[options.package_data] +broadbean = + py.typed + +[options] +include_package_data = True +package_dir= + =. +packages=find: + python_requires = >=3.7 # We might as well require what we know will work # although older numpy and matplotlib version will probably work too @@ -33,8 +43,16 @@ install_requires = setuptools>=48 versioningit>=1.1.0 -[options] -include_package_data = True -package_dir= - =. -packages=find: +[options.extras_require] +test = + pytest>=6.2.2 + pytest-cov>=3.0.0 + coverage[toml]>=6.2 + black>=22.3.0 # keep this in sync with .pre-commit-config.yaml + mypy>=0.960 + types-pytz>=2021.3.0 + jupyter>=1.0.0 + hypothesis>=5.49.*,<7.0.0 + +[options.packages.find] +where=broadbean \ No newline at end of file From f703967b2ce6c31cfec8f30b25110c94f095c14b Mon Sep 17 00:00:00 2001 From: Mikhail Astafev Date: Fri, 3 Jun 2022 08:53:59 +0200 Subject: [PATCH 04/42] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 60e43e589..58b44f09e 100644 --- a/setup.py +++ b/setup.py @@ -4,4 +4,4 @@ if __name__ == "__main__": setup( cmdclass=get_cmdclasses(), - ) \ No newline at end of file + ) From c8e1294ec701f7bd38cf9cee3ad4cde0d17e90bf Mon Sep 17 00:00:00 2001 From: Mikhail Astafev Date: Fri, 3 Jun 2022 08:55:35 +0200 Subject: [PATCH 05/42] Update _version.py --- broadbean/_version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/broadbean/_version.py b/broadbean/_version.py index 313f76373..835b713bc 100644 --- a/broadbean/_version.py +++ b/broadbean/_version.py @@ -3,10 +3,10 @@ def _get_version() -> str: import versioningit import broadbean - project_dir = Path(qdwsdk.__file__).parent.parent + project_dir = Path(broadbean.__file__).parent.parent if not (project_dir / "pyproject.toml").exists(): project_dir = project_dir.parent return versioningit.get_version(project_dir=project_dir) -__version__ = _get_version() \ No newline at end of file +__version__ = _get_version() From 407eb575acf2b8df1aadbb56320b9d1fac08d55d Mon Sep 17 00:00:00 2001 From: Mikhail Astafev Date: Fri, 3 Jun 2022 08:56:21 +0200 Subject: [PATCH 06/42] Update pyproject.toml --- pyproject.toml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 23c6eeae4..7fd0201c0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,4 +1,3 @@ - [build-system] requires = [ "setuptools >= 56.0", @@ -30,12 +29,7 @@ default-version = "0.0" [tool.versioningit.format] distance = "{next_version}.dev{distance}+{branch}.{vcs}{rev}" -dirty = "{version}" -# At the moment, before releasing via making a Git tag we need to change a line -# in ``conf.ini`` file that's part of the package, which makes the repo "dirty", -# which in turn makes versioningit use the "dirty" version format, while what -# we need is the "clean" part only. As a workaround, for "dirty" situations, -# we now ask versioningit to only use ``version``. +dirty = "{next_version}.dev{distance}+{branch}.{vcs}{rev}.dirty" distance-dirty = "{next_version}.dev{distance}+{branch}.{vcs}{rev}.dirty" [tool.versioningit.vcs] @@ -45,4 +39,3 @@ match = ["v*"] [tool.versioningit.onbuild] source-file = "broadbean/_version.py" build-file = "broadbean/_version.py" - From 87cadfa60c954a536eb8a3aabfe25cfda3a76978 Mon Sep 17 00:00:00 2001 From: Mikhail Astafev Date: Fri, 3 Jun 2022 08:56:46 +0200 Subject: [PATCH 07/42] Update setup.cfg --- setup.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 06e980719..caeb9fd3b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -30,7 +30,6 @@ install_requires = numpy>=1.12.1 matplotlib schema - setuptools>=48 versioningit>=1.1.0 [options] From a63553bdfbe099de0f24e9c8453a8939a1e82cf6 Mon Sep 17 00:00:00 2001 From: Mikhail Astafev Date: Fri, 3 Jun 2022 08:57:26 +0200 Subject: [PATCH 08/42] Update setup.cfg --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index caeb9fd3b..f3485883a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -30,7 +30,7 @@ install_requires = numpy>=1.12.1 matplotlib schema - versioningit>=1.1.0 + versioningit>=1.1.1 [options] include_package_data = True From 3e710db6c13e7c2e0b4c41a6c4d6148917ef1ab8 Mon Sep 17 00:00:00 2001 From: Mikhail Astafev Date: Fri, 3 Jun 2022 08:57:58 +0200 Subject: [PATCH 09/42] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 7fd0201c0..10b51f6a8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ requires = [ "setuptools >= 56.0", "wheel >= 0.29.0", - "versioningit ~= 1.1.0", + "versioningit ~= 1.1.1", ] build-backend = 'setuptools.build_meta' From 1db0609c7c02d8914ff4fa341229ce60bfbb766e Mon Sep 17 00:00:00 2001 From: Mikhail Astafev Date: Fri, 3 Jun 2022 09:00:40 +0200 Subject: [PATCH 10/42] Update _version.py --- broadbean/_version.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/broadbean/_version.py b/broadbean/_version.py index 835b713bc..c032f312b 100644 --- a/broadbean/_version.py +++ b/broadbean/_version.py @@ -4,8 +4,6 @@ def _get_version() -> str: import broadbean project_dir = Path(broadbean.__file__).parent.parent - if not (project_dir / "pyproject.toml").exists(): - project_dir = project_dir.parent return versioningit.get_version(project_dir=project_dir) From 54f46836a88ee12ad06779f10ff34e46c6d5d15b Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Fri, 3 Jun 2022 11:10:13 -0700 Subject: [PATCH 11/42] new line --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 11e988e20..2017c11f6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -54,4 +54,4 @@ test = hypothesis>=5.49.*,<7.0.0 [options.packages.find] -where=broadbean \ No newline at end of file +where=broadbean From c8cd3c54e061d7dfe0d32820e4801fb74512ccc0 Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Fri, 3 Jun 2022 11:10:57 -0700 Subject: [PATCH 12/42] removing comment about black ver sync with precommit --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 2017c11f6..f17967076 100644 --- a/setup.cfg +++ b/setup.cfg @@ -47,7 +47,7 @@ test = pytest>=6.2.2 pytest-cov>=3.0.0 coverage[toml]>=6.2 - black>=22.3.0 # keep this in sync with .pre-commit-config.yaml + black>=22.3.0 mypy>=0.960 types-pytz>=2021.3.0 jupyter>=1.0.0 From 3dbbab728b6ac8f72ba60efecad6f4879fa1a36a Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Fri, 3 Jun 2022 11:12:20 -0700 Subject: [PATCH 13/42] removing mypy overrides --- pyproject.toml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 10b51f6a8..d91f6bc76 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,12 +18,6 @@ warn_unused_ignores = true warn_unused_configs = true warn_redundant_casts = true -[[tool.mypy.overrides]] -module = [ - "broadbean.tests.*", -] -disallow_untyped_defs = false - [tool.versioningit] default-version = "0.0" From f202eb6fa393e8f6bbeab593dc126b8ed8343aaf Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Fri, 3 Jun 2022 11:16:37 -0700 Subject: [PATCH 14/42] workflow for pypi upload --- .github/workflows/upload_to_pypi.yaml | 31 +++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/upload_to_pypi.yaml diff --git a/.github/workflows/upload_to_pypi.yaml b/.github/workflows/upload_to_pypi.yaml new file mode 100644 index 000000000..cfbd62e94 --- /dev/null +++ b/.github/workflows/upload_to_pypi.yaml @@ -0,0 +1,31 @@ +name: Upload Python Package + +on: + push: + tags: + - v* + +jobs: + deploy: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3.0.2 + - name: Set up Python + uses: actions/setup-python@v3.1.2 + with: + python-version: '3.7' + - name: Install build deps + run: pip install --upgrade pip setuptools wheel build + - name: Build + run: | + python -m build + - name: Install Twine + run: pip install twine + - name: Publish + env: + TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} + TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} + run: | + twine upload dist/* \ No newline at end of file From 64d41e0cac0a64cbeb5c8f9c30109e9b72f1671c Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Fri, 3 Jun 2022 11:32:40 -0700 Subject: [PATCH 15/42] add py.typed --- broadbean/py.typed | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 broadbean/py.typed diff --git a/broadbean/py.typed b/broadbean/py.typed new file mode 100644 index 000000000..646879ba5 --- /dev/null +++ b/broadbean/py.typed @@ -0,0 +1,2 @@ +this file marks broadbean as safe for typechecking +https://mypy.readthedocs.io/en/latest/installed_packages.html#installed-packages \ No newline at end of file From bd968f63877f0df6bae953c4b3a76c8e9df768d1 Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Fri, 3 Jun 2022 11:35:25 -0700 Subject: [PATCH 16/42] updates to setup.cfg --- setup.cfg | 5 ----- 1 file changed, 5 deletions(-) diff --git a/setup.cfg b/setup.cfg index f17967076..725192754 100644 --- a/setup.cfg +++ b/setup.cfg @@ -29,10 +29,7 @@ broadbean = [options] include_package_data = True -package_dir= - =. packages=find: - python_requires = >=3.7 # We might as well require what we know will work # although older numpy and matplotlib version will probably work too @@ -53,5 +50,3 @@ test = jupyter>=1.0.0 hypothesis>=5.49.*,<7.0.0 -[options.packages.find] -where=broadbean From c248a09454b4d1a6eb3084bd18774e937397ce7d Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Fri, 3 Jun 2022 11:38:33 -0700 Subject: [PATCH 17/42] missing . --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 725192754..15a508d9c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,7 +6,7 @@ maintainer_email = qcodes-support@microsoft.com description = Package for easily generating and manipulating signal pulses. Developed for use with qubits in the quantum computing labs of Copenhagen, Delft, and Sydney, but - should be generally useable + should be generally useable. keywords = Pulsebuilding signal processing arbitrary waveforms long_description = file: README.md long_description_content_type = text/markdown From 5fab29f517f9cc07e04f6cbfcfb3f589703e680d Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Sat, 4 Jun 2022 22:40:19 -0700 Subject: [PATCH 18/42] add darker to workflow --- .github/workflows/darker.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .github/workflows/darker.yaml diff --git a/.github/workflows/darker.yaml b/.github/workflows/darker.yaml new file mode 100644 index 000000000..37264f09c --- /dev/null +++ b/.github/workflows/darker.yaml @@ -0,0 +1,16 @@ +name: Lint with Darker + +on: [push, pull_request] + +jobs: + lint-with-darker: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3.0.2 + with: + fetch-depth: 0 + - uses: akaihola/darker@1.5.0 + with: + options: "--check --diff" + src: "./broadbean" + revision: "origin/master..." \ No newline at end of file From 5bfdd769d575f4e751c5ca2cc284372e726bc18f Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Sat, 4 Jun 2022 22:43:02 -0700 Subject: [PATCH 19/42] adding min-version to CI --- .github/workflows/pytest-min-versions.yaml | 60 ++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 .github/workflows/pytest-min-versions.yaml diff --git a/.github/workflows/pytest-min-versions.yaml b/.github/workflows/pytest-min-versions.yaml new file mode 100644 index 000000000..3055d4581 --- /dev/null +++ b/.github/workflows/pytest-min-versions.yaml @@ -0,0 +1,60 @@ +name: Run pytest with minimum requirements + +on: + push: + branches: + - 'master' + - 'release/*' + - 'staging' + - 'trying' + tags: + - 'v*' + pull_request: + +jobs: + pytestmin: + + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest] + python-version: [3.7] + env: + DISPLAY: ':99.0' + OS: ${{ matrix.os }} + PYTHON: ${{ matrix.python-version }} + + steps: + - uses: actions/checkout@v3.0.2 + with: + submodules: true + - name: setup ubuntu-latest xvfb + uses: ./.github/actions/setup-ubuntu-latest-xvfb + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v3.1.2 + with: + python-version: ${{ matrix.python-version }} + - name: prepare pip cache + id: prepare-cache-pip + uses: ./.github/actions/prepare-cache-pip + - name: pip cache + uses: actions/cache@v3.0.3 + with: + path: ${{ steps.prepare-cache-pip.outputs.cache-dir }} + key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('**/min-requirements.txt') }}-${{ hashFiles('**/setup.cfg') }} + restore-keys: | + ${{ runner.os }}-${{ matrix.python-version }}-pip- + - name: generate min_requirements.txt + run: | + pip install requirements-builder + pip install versioningit + requirements-builder -l min -e test setup.py -o min_requirements.txt + - name: install min_requirements.txt + run: | + pip install -r min_requirements.txt + - name: install broadbean + run: | + pip install . + - name: Run tests + run: | + pytest --hypothesis-profile ci broadbean \ No newline at end of file From 7c7dd6955ec6d0a54cb3410e1d92dd1a96210dbe Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Sat, 4 Jun 2022 22:44:05 -0700 Subject: [PATCH 20/42] non-local run to CI workflow --- .github/workflows/pytest-non-local.yaml | 59 +++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 .github/workflows/pytest-non-local.yaml diff --git a/.github/workflows/pytest-non-local.yaml b/.github/workflows/pytest-non-local.yaml new file mode 100644 index 000000000..f7b2a9707 --- /dev/null +++ b/.github/workflows/pytest-non-local.yaml @@ -0,0 +1,59 @@ +name: run qcodes.pytest() + +on: + push: + branches: + - 'master' + - 'release/*' + - 'staging' + - 'trying' + tags: + - 'v*' + pull_request: + +jobs: + pytestnonlocal: + + runs-on: ubuntu-latest + strategy: + matrix: + python-version: [3.7] + env: + DISPLAY: ':99.0' + + steps: + - uses: actions/checkout@v3.0.2 + with: + submodules: true + - name: setup ubuntu-latest xvfb + uses: ./.github/actions/setup-ubuntu-latest-xvfb + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v3.1.2 + with: + python-version: ${{ matrix.python-version }} + - name: prepare pip cache + id: prepare-cache-pip + uses: ./.github/actions/prepare-cache-pip + - name: pip cache + uses: actions/cache@v3.0.3 + with: + path: ${{ steps.prepare-cache-pip.outputs.cache-dir }} + key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('**/requirements.txt') }}-${{ hashFiles('**/test_requirements.txt') }}-${{ hashFiles('**/setup.cfg') }} + restore-keys: | + ${{ runner.os }}-${{ matrix.python-version }}-pip- + - name: install requirements.txt + run: | + pip install -r requirements.txt + - name: install test_requirements.txt + run: | + pip install -r test_requirements.txt + - name: install qcodes + run: | + pip install . + - name: Test with pytest + run: | + cd .. + mkdir empty + cd empty + cp ../Qcodes/pyproject.toml . + python -c "import sys; import qcodes; ec = qcodes.test(); sys.exit(ec)" \ No newline at end of file From 859f7fb2086820b29e898ce86a762e77c148b53d Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Sat, 4 Jun 2022 22:53:24 -0700 Subject: [PATCH 21/42] updates to non-local workflow yaml --- .github/workflows/pytest-non-local.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pytest-non-local.yaml b/.github/workflows/pytest-non-local.yaml index f7b2a9707..096d6f39b 100644 --- a/.github/workflows/pytest-non-local.yaml +++ b/.github/workflows/pytest-non-local.yaml @@ -47,7 +47,7 @@ jobs: - name: install test_requirements.txt run: | pip install -r test_requirements.txt - - name: install qcodes + - name: install broadbean run: | pip install . - name: Test with pytest @@ -55,5 +55,5 @@ jobs: cd .. mkdir empty cd empty - cp ../Qcodes/pyproject.toml . - python -c "import sys; import qcodes; ec = qcodes.test(); sys.exit(ec)" \ No newline at end of file + cp ../broadbean/pyproject.toml . + python -c "import sys; import broadbean; ec = broadbean.test(); sys.exit(ec)" \ No newline at end of file From bad8c59a774236dd1b702d28a4f760d53509d2fc Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Sat, 4 Jun 2022 22:56:52 -0700 Subject: [PATCH 22/42] adding black anddarker to project.toml --- pyproject.toml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index d91f6bc76..c13b62a90 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,6 +6,12 @@ requires = [ ] build-backend = 'setuptools.build_meta' +[tool.darker] +isort = true + +[tool.isort] +profile = "black" + [tool.pytest.ini_options] junit_family = "legacy" addopts = "--strict-markers" From 532a1767f8e03fffabff72b562fa602a4ba398a1 Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Sun, 5 Jun 2022 12:46:25 -0700 Subject: [PATCH 23/42] removing darker/precommit and min pytest from this PR --- .github/workflows/darker.yaml | 16 ------ .github/workflows/pytest-min-versions.yaml | 60 ---------------------- .github/workflows/pytest-non-local.yaml | 59 --------------------- pyproject.toml | 6 --- 4 files changed, 141 deletions(-) delete mode 100644 .github/workflows/darker.yaml delete mode 100644 .github/workflows/pytest-min-versions.yaml delete mode 100644 .github/workflows/pytest-non-local.yaml diff --git a/.github/workflows/darker.yaml b/.github/workflows/darker.yaml deleted file mode 100644 index 37264f09c..000000000 --- a/.github/workflows/darker.yaml +++ /dev/null @@ -1,16 +0,0 @@ -name: Lint with Darker - -on: [push, pull_request] - -jobs: - lint-with-darker: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3.0.2 - with: - fetch-depth: 0 - - uses: akaihola/darker@1.5.0 - with: - options: "--check --diff" - src: "./broadbean" - revision: "origin/master..." \ No newline at end of file diff --git a/.github/workflows/pytest-min-versions.yaml b/.github/workflows/pytest-min-versions.yaml deleted file mode 100644 index 3055d4581..000000000 --- a/.github/workflows/pytest-min-versions.yaml +++ /dev/null @@ -1,60 +0,0 @@ -name: Run pytest with minimum requirements - -on: - push: - branches: - - 'master' - - 'release/*' - - 'staging' - - 'trying' - tags: - - 'v*' - pull_request: - -jobs: - pytestmin: - - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest] - python-version: [3.7] - env: - DISPLAY: ':99.0' - OS: ${{ matrix.os }} - PYTHON: ${{ matrix.python-version }} - - steps: - - uses: actions/checkout@v3.0.2 - with: - submodules: true - - name: setup ubuntu-latest xvfb - uses: ./.github/actions/setup-ubuntu-latest-xvfb - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3.1.2 - with: - python-version: ${{ matrix.python-version }} - - name: prepare pip cache - id: prepare-cache-pip - uses: ./.github/actions/prepare-cache-pip - - name: pip cache - uses: actions/cache@v3.0.3 - with: - path: ${{ steps.prepare-cache-pip.outputs.cache-dir }} - key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('**/min-requirements.txt') }}-${{ hashFiles('**/setup.cfg') }} - restore-keys: | - ${{ runner.os }}-${{ matrix.python-version }}-pip- - - name: generate min_requirements.txt - run: | - pip install requirements-builder - pip install versioningit - requirements-builder -l min -e test setup.py -o min_requirements.txt - - name: install min_requirements.txt - run: | - pip install -r min_requirements.txt - - name: install broadbean - run: | - pip install . - - name: Run tests - run: | - pytest --hypothesis-profile ci broadbean \ No newline at end of file diff --git a/.github/workflows/pytest-non-local.yaml b/.github/workflows/pytest-non-local.yaml deleted file mode 100644 index 096d6f39b..000000000 --- a/.github/workflows/pytest-non-local.yaml +++ /dev/null @@ -1,59 +0,0 @@ -name: run qcodes.pytest() - -on: - push: - branches: - - 'master' - - 'release/*' - - 'staging' - - 'trying' - tags: - - 'v*' - pull_request: - -jobs: - pytestnonlocal: - - runs-on: ubuntu-latest - strategy: - matrix: - python-version: [3.7] - env: - DISPLAY: ':99.0' - - steps: - - uses: actions/checkout@v3.0.2 - with: - submodules: true - - name: setup ubuntu-latest xvfb - uses: ./.github/actions/setup-ubuntu-latest-xvfb - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3.1.2 - with: - python-version: ${{ matrix.python-version }} - - name: prepare pip cache - id: prepare-cache-pip - uses: ./.github/actions/prepare-cache-pip - - name: pip cache - uses: actions/cache@v3.0.3 - with: - path: ${{ steps.prepare-cache-pip.outputs.cache-dir }} - key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('**/requirements.txt') }}-${{ hashFiles('**/test_requirements.txt') }}-${{ hashFiles('**/setup.cfg') }} - restore-keys: | - ${{ runner.os }}-${{ matrix.python-version }}-pip- - - name: install requirements.txt - run: | - pip install -r requirements.txt - - name: install test_requirements.txt - run: | - pip install -r test_requirements.txt - - name: install broadbean - run: | - pip install . - - name: Test with pytest - run: | - cd .. - mkdir empty - cd empty - cp ../broadbean/pyproject.toml . - python -c "import sys; import broadbean; ec = broadbean.test(); sys.exit(ec)" \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index c13b62a90..d91f6bc76 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,12 +6,6 @@ requires = [ ] build-backend = 'setuptools.build_meta' -[tool.darker] -isort = true - -[tool.isort] -profile = "black" - [tool.pytest.ini_options] junit_family = "legacy" addopts = "--strict-markers" From c1cf4129931771899a702f8a5e8daea95700f6c6 Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Sun, 5 Jun 2022 13:00:48 -0700 Subject: [PATCH 24/42] adding requirments.txt --- requirements.txt | Bin 0 -> 3334 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000000000000000000000000000000000000..d4a74590c3618636670f7ebfe0a07764ea7c258a GIT binary patch literal 3334 zcmZ{mTW=a!5QNWjr2Q#G0q3%Q$RAi~r9{bl1Y=CF@jwPJW*_#aXScqtY0hA5Aujgm z(_K}4oBw`KOIH?UUD`4!qtcXHy_V(Q@>ze6%iD6L_q*~(c~f4t9F>{u+j0}1i?SWu zoeb`7%TBL#xi52Brxm{6mJhvu&L8BbDF>li%6{Hkg5>?c8@{@em-Ew^kT#0b=zFCX zT!>Q9%;a}k_VTe5+r4bIio7oy#lV_K<6u7yWHVWCqbWb*{6io~T^gNry{}a6ouUyB z%W?TLKGATfFQ~_1VSO86Sn1s<(u3ZK8#M0&2NrFp@}$p|(9aa5=IWy?tFOnvHC1-! zVZ*7J8Oc#-;MJWXnX^6I=wv2M7E4f<~NeN&#qs%GPp zyxEF+Ae%=;T8k5Zxjx96na_2bc+OcXRH+WyUPZK9A)(6dBAe70`I?`!Bp=p0?X4#0 zQQk38=qjq-RzG`OyYRIYKHFJMK0ifta8tSXq=SsmIZmd_(2@@5WHs;Az{hydXSO09 zzTgQ*a5*#Q=cCAP+bfeS&gwZi zSG|MzAkbO-58Jl)6eCh79uFrS4f3=6x@g*ciLJ7W`O&%)b8?icV9F2;cPk zw#V+O&I)60>}0_l$q9ikbfY)z>m{pEWEjP%Ozxlu7~BWUWx8vBcJ9g~9}m$do)p}? zRy^~|lac%~w>Dy73gF10SMB^1e5K=hsFt*hx%d6!vt;4GUf@ z*rIFMF+WzJRPH$PP`P2tiLs(hoq`+PB@$h*)eOP1=93;Wr!NtMIynTNYn`|*jbCytfd$S0e6E{sfACj4c;Vm}VOtx(?DgyuPQseWh2Pa4$dbxf6wyn5byYrx+q zjc^~#sH#V?ted6w<8X5gcN_n2LUB~gY2e%w4|yUR?pN^oS%_+7(mjS%#;SO7Ym8J$OagMlQ;yXEJ29(Q=1!}= z^Hao?m}R{lVerx!=T!PMMVN(w5%!QyI}=X9R5Or||8nu6u~S;dza1XN)^}@!ZRP15ce4++gnF zlWKE6VFMe!d2%6lX2vh~d*-1&&0%eXAYeKXc^aLM60VHe>twH$N{#$)`#hOZ>gcCt zCU+`nA9RVI%!dBa!6VMczKqiTIF~UZtp)TGx>4u tDRht@p2nHIYiVHbb+>}XXwSDO8{iTF{>ezqwd*^d(8&wAuk+BI@IQlu1gro6 literal 0 HcmV?d00001 From 698a7ce1d63adb5c8b93178d0624b85d0165e67c Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Sun, 5 Jun 2022 13:07:12 -0700 Subject: [PATCH 25/42] win32 platform fix --- requirements.txt | Bin 3334 -> 3434 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/requirements.txt b/requirements.txt index d4a74590c3618636670f7ebfe0a07764ea7c258a..2361fd909d1c5753942d74ce008d39e6f9f9edd5 100644 GIT binary patch delta 126 zcmZpZdL^}ii_6-U!Ir_8!GOVp!J0vVp_ri(h~pUw7;+dA8A=$^81fm47;=F!Aax21 d>I~%!nGAVA9Yzf5lZCmI4N2Cu*_7)d69CAA7VrQ7 delta 26 hcmaDQ)h4xpi;J_4!Ir_8!GOVJvMZPJ=2=`9m;hdb2J!#^ From 6768b4b837f9369c9d6435c3f1896b50d98a66b3 Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Sun, 5 Jun 2022 13:10:50 -0700 Subject: [PATCH 26/42] update ci to install from requirments.txt and setup.cfg --- .github/workflows/pytest.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml index da6737fd7..9d8efca45 100644 --- a/.github/workflows/pytest.yaml +++ b/.github/workflows/pytest.yaml @@ -37,12 +37,12 @@ jobs: uses: actions/cache@v3.0.2 with: path: ${{ steps.prepare-cache-pip.outputs.cache-dir }} - key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('**/test_requirements.txt') }}-${{ hashFiles('**/setup.py') }} + key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('**/requirements.txt') }}-${{ hashFiles('**/setup.cfg') }} restore-keys: | ${{ runner.os }}-${{ matrix.python-version }}-pip- - - name: install test_requirements.txt + - name: install requirements.txt run: | - pip install -r test_requirements.txt + pip install -r requirements.txt - name: install broadbean run: | pip install . From 8dc1f74e435b84fa5e5ee4e38ef138ec50201bb3 Mon Sep 17 00:00:00 2001 From: Trevor Morgan <63689909+trevormorgan@users.noreply.github.com> Date: Sun, 5 Jun 2022 13:12:59 -0700 Subject: [PATCH 27/42] Update upload_to_pypi.yaml adding /s --- .github/workflows/upload_to_pypi.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upload_to_pypi.yaml b/.github/workflows/upload_to_pypi.yaml index cfbd62e94..974c4bae2 100644 --- a/.github/workflows/upload_to_pypi.yaml +++ b/.github/workflows/upload_to_pypi.yaml @@ -28,4 +28,4 @@ jobs: TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} run: | - twine upload dist/* \ No newline at end of file + twine upload dist/* From 133694a6b463caf32bca8aca7ddcd28af426a834 Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Sun, 5 Jun 2022 13:19:15 -0700 Subject: [PATCH 28/42] fixing python <= 3.8 dep req --- requirements.txt | Bin 3434 -> 3678 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/requirements.txt b/requirements.txt index 2361fd909d1c5753942d74ce008d39e6f9f9edd5..27fe9b5e6230738a5f3377426b1578b75b54adb3 100644 GIT binary patch delta 223 zcmaDQbx&r)24-Dr1_g!!hDwGKh75*$hCGINhBAg!h9ZVyhD9#@W-MpT8J+mQ5n<**UCcCoBljg|H$?WWG07-c%>;M1& delta 23 fcmca7^Ga&N2IkE=EbEwAjTrP8Og4veu(JUGW*!Ev From 8b24ab418ba967572b40f6f12708cccd8b7fc816 Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Sun, 5 Jun 2022 13:29:27 -0700 Subject: [PATCH 29/42] missing whitespace --- broadbean/py.typed | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/broadbean/py.typed b/broadbean/py.typed index 646879ba5..a4a43c897 100644 --- a/broadbean/py.typed +++ b/broadbean/py.typed @@ -1,2 +1,2 @@ this file marks broadbean as safe for typechecking -https://mypy.readthedocs.io/en/latest/installed_packages.html#installed-packages \ No newline at end of file +https://mypy.readthedocs.io/en/latest/installed_packages.html#installed-packages From ecb52ab243396cbfab67a16d2241dc1e467e0b5d Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Sun, 5 Jun 2022 13:39:02 -0700 Subject: [PATCH 30/42] lock hypothesis due to rounding error --- requirements.txt | Bin 3678 -> 3678 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/requirements.txt b/requirements.txt index 27fe9b5e6230738a5f3377426b1578b75b54adb3..94b7adef7fda4d3473949cbeb9374ae829791738 100644 GIT binary patch delta 14 Vcmca7b5CZ288f5pW^-nBZU87s1Umo# delta 14 Vcmca7b5CZ288c(uW^-nBZU8CJ1bhGh From e4e99d0fecaf9b5f9c808c0ef874ae9af030471a Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Wed, 8 Jun 2022 15:31:41 -0700 Subject: [PATCH 31/42] updates to include pinned document dependancies --- requirements.txt | Bin 3678 -> 4898 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/requirements.txt b/requirements.txt index 94b7adef7fda4d3473949cbeb9374ae829791738..990b1818914d47421c672fa34ab1004a8ac34c2c 100644 GIT binary patch delta 1231 zcmb7D&1(~J5S_MY>__k*QlvsHqMjnzO{(P3gBDRyL69OI^RY?RCfjs(6Rkpn2l3>g z{J@(By@+@W9z1#L)q{8OD*geU{CIDEyW1K>k+9j_-^_dS=FRM<<1bGSfBrZrC!{C7 z1o(N?k*aiX)o?`;BPWz?S&^cgmGih9ag(f2 zT0jPPFMzFypRbv&I6I4Pk6ly}4`hV93MGlN^WpuqCa?nylyJn$QP#S&0Si&tL+t|C zsjZ8%4%i=LYDlMK;+iKD-zyD7sg_x_OfPxM%G&@>UHZuIkrQPZj@g=gyudRGWzKr0 zO1m}RCfC;JT%g#dY-ybJmowEqybYj{joNJ%7VMPo^M`OOuygGUl-QAH3azn0b+)8*lTU`txZWI2ompJi{IM?ok z`7-OB;;ioJ-gMMs?hYlS8>IPWb#8rl3wzjxv_S4_9ZI*;q;Ju_XaOz8XtjX&kByk3;$C(Y*AN$!)A ud16JWpJqP);&LAhTmp`ulu37Wrz<+L0b(3&U+e5`zMF8B!S9$+{>?ATo#gZY delta 106 zcmV-w0G0ouCf*zZ|NfC;(vwmFx|3c4_LG Date: Wed, 8 Jun 2022 15:34:36 -0700 Subject: [PATCH 32/42] use requirments.txt for docs --- .github/workflows/docs.yaml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index a8566e9bd..cbd3788d3 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -61,16 +61,13 @@ jobs: uses: actions/cache@v3.0.2 with: path: ${{ steps.prepare-cache-pip.outputs.cache-dir }} - key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('**/test_requirements.txt') }}-${{ hashFiles('**/docs_requirements.txt') }}-${{ hashFiles('**/setup.py') }} + key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('**/requirements.txt') }}-${{ hashFiles('**/setup.py') }} restore-keys: | ${{ runner.os }}-${{ matrix.python-version }}-pip- - - name: install test_requirements.txt + - name: install requirements.txt run: | - pip install -r test_requirements.txt - - name: install docs_requirements.txt - run: | - pip install -r docs_requirements.txt + pip install -r requirements.txt - name: install broadbean run: pip install . - name: Build docs on linux From 6620906f1c2b54adf51b96f4757f31023510098c Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Wed, 8 Jun 2022 15:36:27 -0700 Subject: [PATCH 33/42] remove dep locking on hypthesis --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 15a508d9c..aa8e6407f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -48,5 +48,5 @@ test = mypy>=0.960 types-pytz>=2021.3.0 jupyter>=1.0.0 - hypothesis>=5.49.*,<7.0.0 + hypothesis>=5.49.0 From 0c5fdbf3c453115fcb665f7bb80d7a359c0bbf4e Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Wed, 8 Jun 2022 15:37:34 -0700 Subject: [PATCH 34/42] version not needed --- setup.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index aa8e6407f..81394fbc3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,5 @@ [metadata] name = broadbean -version = 0.10.0 maintainer = QCoDeS Core Developers maintainer_email = qcodes-support@microsoft.com description = Package for easily generating and manipulating signal From aadff7f8a1fd0470c451ae442cdfa48b5bdf84f4 Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Wed, 8 Jun 2022 15:42:30 -0700 Subject: [PATCH 35/42] set pytest ini default settings --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index d91f6bc76..1bba5b362 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,8 +7,8 @@ requires = [ build-backend = 'setuptools.build_meta' [tool.pytest.ini_options] -junit_family = "legacy" -addopts = "--strict-markers" +minversion = "6.0" +addopts = "-ra -q" [tool.mypy] ignore_missing_imports = true From cac5acaffad6ff5af99a85aea392d6ecd2632637 Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Wed, 8 Jun 2022 15:45:54 -0700 Subject: [PATCH 36/42] utf-8 --- requirements.txt | Bin 4898 -> 2332 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/requirements.txt b/requirements.txt index 990b1818914d47421c672fa34ab1004a8ac34c2c..57910f7e1fd1e3851ce926f888ed2c6dd010af17 100644 GIT binary patch literal 2332 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 From bc02ea98cf62e8c7851bdee8342e6805d599aa65 Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Wed, 8 Jun 2022 22:42:22 -0700 Subject: [PATCH 37/42] pin on patch version --- .github/workflows/docs.yaml | 4 ++-- requirements.txt | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index cbd3788d3..4e667910a 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -17,14 +17,14 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - python-version: [3.7, 3.9, "3.10"] + python-version: [3.8, 3.9, "3.10"] exclude: - os: windows-latest python-version: 3.9 - os: windows-latest python-version: 3.10 - os: ubuntu-latest - python-version: 3.7 + python-version: 3.8 env: DISPLAY: ':99.0' OS: ${{ matrix.os }} diff --git a/requirements.txt b/requirements.txt index 57910f7e1..19f1b74ad 100644 --- a/requirements.txt +++ b/requirements.txt @@ -33,8 +33,8 @@ idna~=3.3 imagesize~=1.3.0 iniconfig~=1.1.1 ipykernel~=6.13.0 -ipython~=8.4.0; python_version>='3.8' -ipython~=7.31.0; python_version<'3.8' +ipython==8.4.0; python_version>='3.8' +ipython==7.31.0; python_version<'3.8' ipython-genutils~=0.2.0 ipywidgets~=7.7.0 jedi~=0.18.1 @@ -51,8 +51,8 @@ MarkupSafe~=2.1.1 matplotlib~=3.5.2 matplotlib-inline~=0.1.3 mistune~=0.8.4 -numpy~=1.21.5; python_version<'3.8' -numpy~=1.22.4; python_version>='3.8' +numpy==1.21.5; python_version < '3.8' +numpy==1.22.4; python_version >= '3.8' mypy-extensions~=0.4.3 nbclient~=0.6.4 nbconvert~=6.5.0 @@ -83,7 +83,7 @@ pytest-cov~=3.0.0 python-dateutil~=2.8.2 pytz~=2022.1 pywin32==304; sys_platform == 'win32' -pywinpty~=2.0.5; sys_platform == 'win32' +pywinpty==2.0.5; sys_platform == 'win32' PyYAML~=6.0 pyzmq~=23.1.0 qtconsole~=5.3.1 From f10077d96fe019a50a6843ecb680eb1281335de7 Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Wed, 8 Jun 2022 23:30:24 -0700 Subject: [PATCH 38/42] remove unused requirments files --- docs_requirements.txt | 2 -- test_requirements.txt | 6 ------ 2 files changed, 8 deletions(-) delete mode 100644 docs_requirements.txt delete mode 100644 test_requirements.txt diff --git a/docs_requirements.txt b/docs_requirements.txt deleted file mode 100644 index 82133027c..000000000 --- a/docs_requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -sphinx -sphinx_rtd_theme diff --git a/test_requirements.txt b/test_requirements.txt deleted file mode 100644 index bb76bd3a8..000000000 --- a/test_requirements.txt +++ /dev/null @@ -1,6 +0,0 @@ -hypothesis==6.46.7 -pytest -pytest-cov -coverage[toml] -mypy==0.950 -jupyter From d0a76871340256eccb886c23981d50c09b7a3bce Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Wed, 8 Jun 2022 23:37:16 -0700 Subject: [PATCH 39/42] rm duplicate numpy --- requirements.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 19f1b74ad..4914be667 100644 --- a/requirements.txt +++ b/requirements.txt @@ -51,8 +51,8 @@ MarkupSafe~=2.1.1 matplotlib~=3.5.2 matplotlib-inline~=0.1.3 mistune~=0.8.4 -numpy==1.21.5; python_version < '3.8' -numpy==1.22.4; python_version >= '3.8' +numpy~=1.21.5; python_version<'3.8' +numpy~=1.22.4; python_version>='3.8' mypy-extensions~=0.4.3 nbclient~=0.6.4 nbconvert~=6.5.0 @@ -60,7 +60,6 @@ nbformat~=5.4.0 nest-asyncio~=1.5.5 nodeenv~=1.6.0 notebook~=6.4.11 -numpy~=1.22.4 packaging~=21.3 pandocfilters~=1.5.0 parso~=0.8.3 From f5c5e2f772bc6210e26a56564758a082a01c0c21 Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Wed, 8 Jun 2022 23:59:28 -0700 Subject: [PATCH 40/42] missing mypy --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 4914be667..74d73f5b4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -53,6 +53,7 @@ matplotlib-inline~=0.1.3 mistune~=0.8.4 numpy~=1.21.5; python_version<'3.8' numpy~=1.22.4; python_version>='3.8' +mypy~=0.950 mypy-extensions~=0.4.3 nbclient~=0.6.4 nbconvert~=6.5.0 From 1e3786a333d693f9cb223758838553dfe95143f0 Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Thu, 9 Jun 2022 00:20:19 -0700 Subject: [PATCH 41/42] bring back 3.7 for docs buiild --- .github/workflows/docs.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 4e667910a..0c1b0da72 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -17,14 +17,14 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - python-version: [3.8, 3.9, "3.10"] + python-version: [3.7, 3.9, "3.10"] exclude: - os: windows-latest python-version: 3.9 - os: windows-latest python-version: 3.10 - os: ubuntu-latest - python-version: 3.8 + python-version: 3.7 env: DISPLAY: ':99.0' OS: ${{ matrix.os }} @@ -61,7 +61,7 @@ jobs: uses: actions/cache@v3.0.2 with: path: ${{ steps.prepare-cache-pip.outputs.cache-dir }} - key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('**/requirements.txt') }}-${{ hashFiles('**/setup.py') }} + key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('**/requirements.txt') }}-${{ hashFiles('**/setup.cfg') }} restore-keys: | ${{ runner.os }}-${{ matrix.python-version }}-pip- From b0b194ec847bc75a4fd51bab8615a06d6e259635 Mon Sep 17 00:00:00 2001 From: Trevor Morgan Date: Thu, 9 Jun 2022 00:33:57 -0700 Subject: [PATCH 42/42] remove outdatre comment --- setup.cfg | 2 -- 1 file changed, 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 81394fbc3..6fdfc48cd 100644 --- a/setup.cfg +++ b/setup.cfg @@ -30,8 +30,6 @@ broadbean = include_package_data = True packages=find: python_requires = >=3.7 -# We might as well require what we know will work -# although older numpy and matplotlib version will probably work too install_requires = numpy>=1.12.1 matplotlib