ship examples with package

2016-04-05 13:51:45 +08:00 · 2016-04-05 13:51:45 +08:00 · affe4d45aa
parent 2dfc1a8d17
commit affe4d45aa
28 changed files with 16 additions and 6 deletions
--- a/.gitignore
+++ b/.gitignore
@ -18,11 +18,11 @@ __pycache__/

 /artiq/test/results
 /artiq/test/h5types.h5
-/examples/master/results
-/examples/master/last_rid.pyon
-/examples/master/dataset_db.pyon
-/examples/sim/results
-/examples/sim/dataset_db.pyon
+/artiq/examples/master/results
+/artiq/examples/master/last_rid.pyon
+/artiq/examples/master/dataset_db.pyon
+/artiq/examples/sim/results
+/artiq/examples/sim/dataset_db.pyon

 # recommended location for testbed
 /run
--- a/MANIFEST.in
+++ b/MANIFEST.in
@ -1,4 +1,5 @@
 graft artiq/runtime
+graft artiq/examples
 include artiq/gui/logo.svg
 include versioneer.py
 include artiq/_version.py
--- a/artiq/examples/artiq_ipython_notebook.ipynb
+++ b/artiq/examples/artiq_ipython_notebook.ipynb
--- a/artiq/examples/fit_image.py
+++ b/artiq/examples/fit_image.py
--- a/artiq/examples/master/device_db.pyon
+++ b/artiq/examples/master/device_db.pyon
@ -204,7 +204,7 @@
        "host": "::1",
        "port": 6283,
        "target_name": "camera_sim",
-        "command": "./remote_exec_controller.py"
+        "command": "python3.5 -m artiq.examples.remote_exec_controller"
    },
    "camera_sim_rexec": {
        "type": "controller_aux_target",
--- a/artiq/examples/master/repository/arguments_demo.py
+++ b/artiq/examples/master/repository/arguments_demo.py
--- a/artiq/examples/master/repository/coredevice_examples/pdq2_simple.py
+++ b/artiq/examples/master/repository/coredevice_examples/pdq2_simple.py
--- a/artiq/examples/master/repository/coredevice_examples/photon_histogram.py
+++ b/artiq/examples/master/repository/coredevice_examples/photon_histogram.py
--- a/artiq/examples/master/repository/coredevice_examples/simple/ad5360.py
+++ b/artiq/examples/master/repository/coredevice_examples/simple/ad5360.py
--- a/artiq/examples/master/repository/coredevice_examples/simple/blink_forever.py
+++ b/artiq/examples/master/repository/coredevice_examples/simple/blink_forever.py
--- a/artiq/examples/master/repository/coredevice_examples/simple/dds_test.py
+++ b/artiq/examples/master/repository/coredevice_examples/simple/dds_test.py
--- a/artiq/examples/master/repository/coredevice_examples/simple/handover.py
+++ b/artiq/examples/master/repository/coredevice_examples/simple/handover.py
--- a/artiq/examples/master/repository/coredevice_examples/simple/mandelbrot.py
+++ b/artiq/examples/master/repository/coredevice_examples/simple/mandelbrot.py
--- a/artiq/examples/master/repository/coredevice_examples/tdr.py
+++ b/artiq/examples/master/repository/coredevice_examples/tdr.py
--- a/artiq/examples/master/repository/coredevice_examples/transport.py
+++ b/artiq/examples/master/repository/coredevice_examples/transport.py
--- a/artiq/examples/master/repository/flopping_f_simulation.py
+++ b/artiq/examples/master/repository/flopping_f_simulation.py
--- a/artiq/examples/master/repository/histograms.py
+++ b/artiq/examples/master/repository/histograms.py
--- a/artiq/examples/master/repository/remote_exec_demo.py
+++ b/artiq/examples/master/repository/remote_exec_demo.py
--- a/artiq/examples/master/repository/remote_exec_processing.py
+++ b/artiq/examples/master/repository/remote_exec_processing.py
--- a/artiq/examples/master/repository/run_forever.py
+++ b/artiq/examples/master/repository/run_forever.py
--- a/artiq/examples/master/repository/speed_benchmark.py
+++ b/artiq/examples/master/repository/speed_benchmark.py
--- a/artiq/examples/master/repository/utilities/dds_setter.py
+++ b/artiq/examples/master/repository/utilities/dds_setter.py
--- a/artiq/examples/master/repository/utilities/terminate_all.py
+++ b/artiq/examples/master/repository/utilities/terminate_all.py
--- a/artiq/examples/remote_exec_controller.py
+++ b/artiq/examples/remote_exec_controller.py
--- a/artiq/examples/sim/al_spectroscopy.py
+++ b/artiq/examples/sim/al_spectroscopy.py
--- a/artiq/examples/sim/device_db.pyon
+++ b/artiq/examples/sim/device_db.pyon
--- a/artiq/examples/sim/simple_simulation.py
+++ b/artiq/examples/sim/simple_simulation.py
--- a/doc/manual/faq.rst
+++ b/doc/manual/faq.rst
@ -6,6 +6,15 @@ FAQ
 How do I ...
 ============

+find ARTIQ examples?
+--------------------
+
+The examples are installed in the ``examples`` folder of the ARTIQ package. You can find where the ARTIQ package is installed on your machine with: ::
+
+  python3.5 -c "import artiq; print(artiq.__path__[0])"
+
+Copy the ``examples`` folder from that path into your home/user directory, and start experimenting!
+
 prevent my first RTIO command from causing an underflow?
 --------------------------------------------------------