M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 1
Code Issues Projects Releases Wiki Activity

remove asyncserial dependency

This commit is contained in:
Sebastien Bourdeauducq 2019-04-20 10:51:29 +08:00
parent 119f64243f
commit d958b20bb8
4 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conda/artiq-dev/meta.yaml
View File

@ -29,7 +29,6 @@ requirements:
- scipy - scipy
- numpy - numpy
- prettytable - prettytable
- asyncserial
- sphinx 1.4.8 - sphinx 1.4.8
- sphinx-argparse - sphinx-argparse
- sphinxcontrib-wavedrom - sphinxcontrib-wavedrom

1
conda/artiq/meta.yaml
View File

@ -35,7 +35,6 @@ requirements:
- scipy - scipy
- numpy - numpy
- prettytable - prettytable
- asyncserial
- h5py 2.8 - h5py 2.8
- python-dateutil - python-dateutil
- pyqt >=5.5 - pyqt >=5.5

2
doc/manual/conf.py
View File

@ -32,7 +32,7 @@ mock_modules = ["artiq.gui.waitingspinnerwidget",
"artiq.compiler.embedding", "artiq.compiler.embedding",
"quamash", "pyqtgraph", "matplotlib", "quamash", "pyqtgraph", "matplotlib",
"numpy", "dateutil", "dateutil.parser", "prettytable", "PyQt5", "numpy", "dateutil", "dateutil.parser", "prettytable", "PyQt5",
"h5py", "serial", "scipy", "scipy.interpolate", "asyncserial", "h5py", "serial", "scipy", "scipy.interpolate",
"llvmlite_artiq", "Levenshtein", "aiohttp", "pythonparser"] "llvmlite_artiq", "Levenshtein", "aiohttp", "pythonparser"]
for module in mock_modules: for module in mock_modules:

2
setup.py
View File

@ -12,7 +12,7 @@ if sys.version_info[:3] < (3, 5, 3):
# Depends on PyQt5, but setuptools cannot check for it. # Depends on PyQt5, but setuptools cannot check for it.
requirements = [ requirements = [
"asyncserial", "numpy", "scipy", "numpy", "scipy",
"python-dateutil", "prettytable", "h5py", "python-dateutil", "prettytable", "h5py",
"quamash", "pyqtgraph", "pygit2", "aiohttp", "quamash", "pyqtgraph", "pygit2", "aiohttp",
"llvmlite_artiq", "pythonparser", "python-Levenshtein", "llvmlite_artiq", "pythonparser", "python-Levenshtein",