From d958b20bb894a02e8b56aa3415e2b997f12e724a Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sat, 20 Apr 2019 10:51:29 +0800 Subject: [PATCH] remove asyncserial dependency --- conda/artiq-dev/meta.yaml | 1 - conda/artiq/meta.yaml | 1 - doc/manual/conf.py | 2 +- setup.py | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/conda/artiq-dev/meta.yaml b/conda/artiq-dev/meta.yaml index 5817fd27b..4e1a02131 100644 --- a/conda/artiq-dev/meta.yaml +++ b/conda/artiq-dev/meta.yaml @@ -29,7 +29,6 @@ requirements: - scipy - numpy - prettytable - - asyncserial - sphinx 1.4.8 - sphinx-argparse - sphinxcontrib-wavedrom diff --git a/conda/artiq/meta.yaml b/conda/artiq/meta.yaml index 31cf6bf4a..2c17fd2e4 100644 --- a/conda/artiq/meta.yaml +++ b/conda/artiq/meta.yaml @@ -35,7 +35,6 @@ requirements: - scipy - numpy - prettytable - - asyncserial - h5py 2.8 - python-dateutil - pyqt >=5.5 diff --git a/doc/manual/conf.py b/doc/manual/conf.py index 262ea2b88..db73a32e8 100644 --- a/doc/manual/conf.py +++ b/doc/manual/conf.py @@ -32,7 +32,7 @@ mock_modules = ["artiq.gui.waitingspinnerwidget", "artiq.compiler.embedding", "quamash", "pyqtgraph", "matplotlib", "numpy", "dateutil", "dateutil.parser", "prettytable", "PyQt5", - "h5py", "serial", "scipy", "scipy.interpolate", "asyncserial", + "h5py", "serial", "scipy", "scipy.interpolate", "llvmlite_artiq", "Levenshtein", "aiohttp", "pythonparser"] for module in mock_modules: diff --git a/setup.py b/setup.py index f57925539..fbfc34ea1 100755 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ if sys.version_info[:3] < (3, 5, 3): # Depends on PyQt5, but setuptools cannot check for it. requirements = [ - "asyncserial", "numpy", "scipy", + "numpy", "scipy", "python-dateutil", "prettytable", "h5py", "quamash", "pyqtgraph", "pygit2", "aiohttp", "llvmlite_artiq", "pythonparser", "python-Levenshtein",