Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1891725e12e2
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4bd5a55a2a3e
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Feb 18, 2016

  1. artiq_master: directly log, explicit imports

    @jordens
    jordens committed Feb 18, 2016
    Copy the full SHA
    6830703 View commit details

  2. RELEASEING: cleanup, add note about main conda label

    @jordens
    jordens committed Feb 18, 2016
    Copy the full SHA
    4bd5a55 View commit details
Showing with 16 additions and 11 deletions.
  1. +13 −9 RELEASING.rst
  2. +3 −2 artiq/frontend/artiq_master.py
22 changes: 13 additions & 9 deletions RELEASING.rst
View file
Original file line number Diff line number Diff line change
@@ -3,15 +3,19 @@ Release process

Maintain ``RELEASE_NOTES.rst`` with a list of new features and API changes in each major release.

Major releases:
Major releases
--------------

1. Create branch release-X from master.
2. Remove any unfinished features.
3. Test and fix any problems found.
4. Tag X.0.
1. Create branch release-X from master.
2. Ensure that release versions of all packages required are available under the ``main`` label in conda. Ensure that new packages in ``main`` do not break older ARTIQ releases.
3. Remove any unfinished features.
4. Test and fix any problems found.
5. If you have willing testers for release candidates, tag X.0rc0, have it build, and point testers there. Iterate over the previous points with new release candidates if necessary.
6. Tag X.0, have it build, and copy its packages to ``main`` channel.

Minor (bugfix) releases:
Minor (bugfix) releases
-----------------------

1. Backport bugfixes from the master branch or fix bugs specific to old releases into the currently maintained release-X branch(es).
2. When significant bugs have been fixed, tag X.Y+1.
3. To help dealing with regressions, no new features or refactorings should be implemented in release-X branches. Those happen in the master branch, and then a new release-X+1 branch is created.
1. Backport bugfixes from the master branch or fix bugs specific to old releases into the currently maintained release-X branch(es).
2. When significant bugs have been fixed, tag X.Y+1.
3. To help dealing with regressions, no new features or refactorings should be implemented in release-X branches. Those happen in the master branch, and then a new release-X+1 branch is created.
5 changes: 3 additions & 2 deletions artiq/frontend/artiq_master.py
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,8 @@
import os
import logging

from artiq.tools import *
from artiq.tools import (simple_network_args, atexit_register_coroutine,
bind_address_from_args)
from artiq.protocols.pc_rpc import Server as RPCServer
from artiq.protocols.sync_struct import Publisher
from artiq.protocols.logging import Server as LoggingServer
@@ -115,7 +116,7 @@ def main():
bind, args.port_logging))
atexit_register_coroutine(server_logging.stop)

loop.call_soon(logger.info, "running, bound to %s", bind)
logger.info("running, bound to %s", bind)
loop.run_forever()

if __name__ == "__main__":