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: 591e44b2271f
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: d51b27e0aa25
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Aug 4, 2016

  1. tools: remove uneeded checkcache

    @sbourdeauducq
    sbourdeauducq committed Aug 4, 2016
    Copy the full SHA
    f64a1f5 View commit details

  2. tools: cleanup artiq_version

    @sbourdeauducq
    sbourdeauducq committed Aug 4, 2016
    Copy the full SHA
    d51b27e View commit details
Showing with 1 addition and 5 deletions.
  1. +1 −5 artiq/tools.py
6 changes: 1 addition & 5 deletions artiq/tools.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import importlib.machinery
import linecache
import logging
import sys
import asyncio
@@ -13,8 +12,7 @@
from artiq.language.environment import is_experiment
from artiq.protocols import pyon
from artiq.appdirs import user_config_dir
from artiq._version import get_versions
artiq_version = get_versions()['version']
from artiq import __version__ as artiq_version


__all__ = ["parse_arguments", "elide", "short_format", "file_import",
@@ -74,8 +72,6 @@ def short_format(v):


def file_import(filename, prefix="file_import_"):
linecache.checkcache(filename)

modname = filename
i = modname.rfind("/")
if i > 0: