M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity
3,640 Commits 13 Branches 35 Tags 25 MiB
Commit Graph

149 Commits

Author SHA1 Message Date
whitequark 6342829e68 conda: use GIT_FULL_HASH rather than GIT_DESCRIBE_HASH. 2017-04-22 15:30:29 +08:00
whitequark 5f53a13fec Commit missing parts of 0d0ddf2e. 2017-04-22 15:30:04 +08:00
whitequark 419042b5d3 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-22 15:29:41 +08:00
Sebastien Bourdeauducq 1572d852aa conda: use conda-forge and depend on pyqtgraph 0.10.0 (#704) 2017-04-13 00:58:04 +08:00
Sebastien Bourdeauducq bf86828445 add missing artiq-dev.yaml 2017-03-03 18:07:03 +08:00
Sebastien Bourdeauducq 55f217ceef conda: use artiq-dev system 2017-03-03 18:02:46 +08:00
Robert Jördens 791976e6d0 conda: pyqt >= 5.5 2017-03-02 23:14:58 +01:00
Chris Ballance 3ae7fde21f conda: use anaconda default pyqt (fixes #670) 2017-03-02 23:14:58 +01:00
Robert Jördens b4df00009b doc/conda: fix conda env description syntax 2017-01-26 18:20:30 +01:00
Robert Jördens 25ff94dbfa doc: use minimal conda environment to build 2017-01-26 18:20:30 +01:00
Robert Jördens 6c995e1f07 conda: fix sphinx pin 2017-01-26 00:54:00 +01:00
Robert Jördens 364bd726bb 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:50 +01:00
Sebastien Bourdeauducq 00402c9af9 conda: update migen version requirements 2016-09-24 21:02:32 +08:00
Robert Jördens 642c7abdad conda: fix nist_clock summary 2016-09-03 11:08:58 +02:00
Robert Jördens 9d08011a1f conda: misoc 0.3 2016-08-26 14:09:05 +02:00
Robert Jördens c4559fcd99 doc: use sphinx_rtd_theme 2016-08-25 21:53:50 +02:00
Robert Jördens 1f31fa620a doc: use wavedrom to visualize stuff 2016-08-25 12:16:05 +02:00
whitequark 6c2ca69d4f conda: require misoc 0.2. 2016-08-16 07:08:35 +00:00
whitequark 5f5975844a Revert "Update for LLVM 3.9." 
This reverts commit 3aa7b99b8f.
 2016-08-13 04:43:19 +00:00
whitequark 3aa7b99b8f Update for LLVM 3.9. 2016-08-13 03:28:04 +00:00
Sebastien Bourdeauducq c065b5866f require Python 3.5.2, remove monkey patches 2016-07-07 14:55:21 +08:00
Sebastien Bourdeauducq 4e241f10c5 conda: try lowercase package name 2016-06-19 09:59:42 +08:00
Sebastien Bourdeauducq b97ad69135 conda: install lit and OutputCheck 2016-06-19 09:58:02 +08:00
Sebastien Bourdeauducq 6500d3fc63 conda: use setuptools entry_points 
Conda entry_points doesn't support gui_scripts
 2016-06-19 09:31:23 +08:00
Sebastien Bourdeauducq 4d6f53ce67 conda: obviously, platform-specific dependencies are broken 2016-05-27 22:45:01 -05:00
Sebastien Bourdeauducq 16063ff8fb conda: another attempt at platform-specific dependencies 2016-05-27 22:25:19 -05:00
Sebastien Bourdeauducq 8c1f1d8f2a rpctool: make readline optional, add to conda dependencies. Closes #442 2016-05-25 11:11:59 -05:00
Robert Jördens 6686383378 artiq_browser: add entry points 2016-04-05 17:22:16 +08:00
Sebastien Bourdeauducq ed1c368e73 gateware: name targets consistently. Closes #290 2016-04-05 16:07:29 +08:00
whitequark e908a5fceb conda: update llvmlite-artiq dependency. 
Build 24 includes addc optimizations.
 2016-04-05 00:48:41 +00:00
Sebastien Bourdeauducq 7453d85d5e GUI -> dashboard 2016-04-04 22:12:45 +08:00
whitequark ce30045dd4 conda: update llvmlite-artiq dependency. 
Build 22 includes debug information support.
 2016-04-02 18:40:06 +00:00
whitequark 6a34a75b99 conda: require llvmlite-artiq built for LLVM 3.8. 2016-04-01 09:35:28 +00:00
whitequark 2c04979727 compiler: update for LLVM 3.7. 2016-03-31 11:23:47 +00:00
Sebastien Bourdeauducq d9e9b66494 depend on asyncserial 2016-03-22 21:56:09 +08:00
Sebastien Bourdeauducq 129927490b conda: pyqt -> pyqt5 2016-02-21 17:14:59 +08:00
whitequark 1cfca74fcb conda: remove spurious artiq dep from gateware packages. 2016-02-14 13:35:40 +00:00
Robert Jördens 734fa593e4 conda bitstreams: depend on artiq 0.1 2016-02-14 14:21:31 +01:00
Robert Jördens ed36a96f8f conda/artiq: pyqt (not 5, to be revisited) 2016-02-14 02:24:46 +01:00
Robert Jördens 801b256d67 conda: use git_url 
needed for conda-build >= 0.19.0
 2016-02-14 02:21:07 +01:00
Sebastien Bourdeauducq fcf7a6be2e Revert "conda: restrict binutils-or1k-linux dependency to linux." 
This reverts commit 5bead8b83f.
 2016-02-10 23:42:24 +01:00
Sebastien Bourdeauducq 64263b75d0 use https for m-labs.hk 2016-02-10 17:20:29 +01:00
Sebastien Bourdeauducq f3f667be5b conda: fix pyqt package name 2016-02-09 10:47:38 +01:00
Sebastien Bourdeauducq d873c25b8b Use Qt5 2016-02-08 19:32:40 +01:00
Sebastien Bourdeauducq b7de92e96c remove pxi6733 support (now lives at https://github.com/m-labs/aq_ni6733 2016-02-02 18:41:57 +01:00
Sebastien Bourdeauducq 55b31244ed remove stale dependency on pyelftools 2016-02-02 17:27:29 +01:00
whitequark 5bead8b83f conda: restrict binutils-or1k-linux dependency to linux. 2016-01-27 09:24:54 +00:00
Sebastien Bourdeauducq dae63bd10c conda: add artiq-kc705-nist_clock 2016-01-20 21:36:21 -05:00
Robert Jördens 25ce0928bd build/doc: simplify proxy bitstream locations 2016-01-05 10:23:50 -07:00
whitequark 400999f6ad Revert "conda: use BUILDNUMBER from environment." 
This reverts commit ff09a982c5.
 2016-01-05 16:06:05 +00:00