srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity
6,404 Commits 63 Branches 34 Tags 19 MiB
Commit Graph

134 Commits

Author SHA1 Message Date
David Nadlinger 04952cb230 conda: Require recent aiohttp 
artiq_influxdb doesn't work with aiohttp 0.17 (anymore), as the
ClientSession API changed. I have not looked up precisely which
is the first version that works, but 3.x has been out for almost
a year and is available on the Anaconda/conda-forge channels.
 2019-02-07 10:41:48 +08:00
whitequark c3c9ffcd4f conda: override --install-lib, not --prefix. 2018-05-25 06:45:46 +00:00
whitequark 44910efd0a conda: remove lib/python3.5 from artiq package paths as well. 
Following c9287cfc.
 2018-05-25 02:23:18 +00:00
Sebastien Bourdeauducq b81b20caf8 conda: use h5py 2.8 
For some reason, conda installs 2.7 by default, which causes messages such as:
/home/sb/miniconda3/envs/py35/lib/python3.5/site-packages/h5py/__init__.py:36: FutureWarning: Conversion of the second argument of issubdtype from `float` to `np.floating` is deprecated. In future, it will be treated as `np.float64 == np.dtype(float).type`.
 2018-05-16 16:25:44 +08:00
Robert Jördens bfa7637760 conda: bump llvmlite-artiq dependency (ncurses) 2018-05-07 10:15:45 +02:00
whitequark 84e598de69 conda: fix build number for llvmlite-artiq (again). 2018-05-01 09:08:17 +00:00
whitequark 6cb9c8a9c1 conda: fix build number for llvmlite-artiq. 2018-05-01 09:04:15 +00:00
whitequark 623614f835 Update LLVM to 6.0.0 and Rust to 1.25.0. 2018-05-01 08:57:37 +00:00
whitequark 21b1757bfd Fix e8d21adf3. 
As usual, conda documentation does not provide a clear explanation
of what the options do...
 2018-02-22 13:26:42 +00:00
whitequark e8d21adf30 conda: turn off binary prefix detection everywhere. 
This just adds garbage to logs and serves no useful purpose.
 2018-02-22 12:55:47 +00:00
whitequark 8938b69559 conda: simplify recipes. 
conda-build appears to no longer require the workaround with
environ.get("GIT_*", "") to work.
 2018-02-22 12:45:27 +00:00
Sebastien Bourdeauducq eed64a6d6b conda: fix openocd dependency 2018-02-21 10:35:31 +08:00
Robert Jördens 4c22d64ee4 conda: sync artiq/artiq-dev dependencies 2018-01-30 08:36:55 +01:00
whitequark 40ca0ac83f conda: update llvmlite-artiq dependency. 2017-12-26 21:46:20 +00:00
whitequark cf5d50de0c conda: do not compile .py files to .pyc. 
We are producing a noarch package, and conda will strip all .pyc
files, so this is a significant waste of time.
 2017-11-26 23:59:53 +00:00
Robert Jördens 70e6f77d4d conda: bump openocd to simplify pinning 2017-10-23 17:26:41 +02:00
Robert Jördens 7edff48b6d conda/artiq_flash: use proxy bitstream package 
fix #841
 2017-10-23 15:21:54 +02:00
Robert Jördens 22d5859876 conda: pin openocd dependency 2017-10-23 14:32:51 +02:00
Robert Jördens 3329d8990d conda/artiq: also bump openocd 2017-10-23 13:20:11 +02:00
Sebastien Bourdeauducq 0f4bc54e92 conda: fix llvmlite-artiq dependency 2017-09-30 01:32:10 +08:00
Robert Jördens 5c66b63768 setup.py etc: update license 2017-07-18 11:31:43 +02:00
whitequark 53f7d145a4 conda: update pythonparser dependency. 2017-06-14 03:35:54 +00:00
Sebastien Bourdeauducq 5a134c82c5 conda: use new noarch system 2017-06-06 11:16:12 +08:00
Sebastien Bourdeauducq 7f2f0031d6 conda: use stock dateutil package 2017-06-05 17:57:35 +08:00
Sebastien Bourdeauducq 0b437c7645 conda: shorten git hash in strings to 8 characters instead of 12 2017-06-05 11:43:10 +08:00
Sebastien Bourdeauducq 234e41df9d bump setuptools (#705) 2017-06-05 11:39:42 +08:00
Sebastien Bourdeauducq 8c8203ef73 require Python 3.5.3+ (#737) 2017-06-05 00:50:54 +08:00
Robert Jördens e87b6b99f7 depend on python >=3.5.2 <3.6 2017-05-11 15:05:00 +02:00
whitequark d383145752 conda: use GIT_FULL_HASH rather than GIT_DESCRIBE_HASH. 2017-04-20 16:58:38 +00:00
whitequark 0d0ddf2e58 conda: limit git hashes in build numbers to 8 chars exactly. 
Before this commit, a nasty edge case was possible where repositories
on different builders have had different sets of objects fetched
into them, and so git-describe selected different lengths for
abbreviating hashes.

See also https://github.com/conda/conda-build/issues/1940.
 2017-04-20 16:40:10 +00:00
Sebastien Bourdeauducq 99196986c0 conda: use conda-forge and depend on pyqtgraph 0.10.0 (#704) 2017-04-13 00:55:16 +08:00
Sebastien Bourdeauducq 6d1046cae2 conda: use python 3.5.3 2017-03-29 09:39:02 +08:00
Robert Jördens 3c50c46a81 conda: pyqt >= 5.5 2017-02-28 13:22:39 +01:00
Chris Ballance 34421ee2f4 conda: use anaconda default pyqt (fixes #670) 2017-02-28 10:38:46 +00:00
Robert Jördens edab068ac9 conda: pull in openocd in artiq and artiq-dev 2017-02-02 19:53:18 +01:00
Robert Jördens e23be49208 conda: clean up dependencies 2017-02-01 22:26:12 +01:00
Robert Jördens e93f610323 conda/artiq: don't need numpy or binutils to build 2017-02-01 21:48:15 +01:00
whitequark c529cefc89 conda: bump llvmlite-artiq dependency. 2017-01-27 11:14:53 +00:00
Robert Jördens aa3af4f72d conda: fix sphinx pin 2017-01-26 00:53:43 +01:00
Robert Jördens 151b51f836 conda: pin sphinx to 1.4.8 (closes #645) 
can be reverted when https://github.com/snide/sphinx_rtd_theme/pull/346 is
released
 2017-01-26 00:51:26 +01:00
whitequark 7c2b1155ef conda: bump llvmlite-artiq dep. 2016-11-12 13:58:00 +00:00
whitequark 5eb940deb7 conda: bump llvmlite-artiq dep. 2016-11-12 04:09:34 +00:00
whitequark 67e743d74a conda: use pythonparser 1.0. 2016-11-09 15:19:27 +00:00
whitequark 71f1d38860 conda: tighten pythonparser dependency (fixes #600). 2016-11-09 15:10:53 +00:00
whitequark 124b257e05 conda: update for LLVM 3.9. 2016-11-08 23:24:03 +00:00
whitequark ec8fe6f8bd Revert "Revert "Revert "Revert "Update for LLVM 3.9."""" 
This reverts commit 7b81ed1d18.
 2016-11-08 14:22:47 +00:00
whitequark 7b81ed1d18 Revert "Revert "Revert "Update for LLVM 3.9.""" 
This reverts commit 0d7688017b.
 2016-11-08 12:58:20 +00:00
whitequark 0d7688017b Revert "Revert "Update for LLVM 3.9."" 
This reverts commit 5f5975844a.
 2016-11-08 11:59:16 +00:00
Robert Jördens 0a4d4e30ef doc: use sphinx_rtd_theme 2016-08-25 21:52:46 +02:00
Robert Jördens 60919c2ea7 doc: use wavedrom to visualize stuff 2016-08-25 12:17:05 +02:00