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: e749bae302f1
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: 594162325b5d
Choose a head ref
  • 2 commits
  • 8 files changed
  • 1 contributor

Commits on Nov 9, 2015

  1. runtime/liblwip: fix symbolic link creation

    @sbourdeauducq
    sbourdeauducq committed Nov 9, 2015
    Copy the full SHA
    3c63e5b View commit details

  2. use versioneer

    @sbourdeauducq
    sbourdeauducq committed Nov 9, 2015
    Copy the full SHA
    5941623 View commit details
Showing with 2,184 additions and 4 deletions.
  1. +1 −0 .gitattributes
  2. +2 −0 MANIFEST.in
  3. +4 −0 artiq/__init__.py
  4. +460 −0 artiq/_version.py
  5. +4 −2 artiq/runtime/liblwip/Makefile
  6. +7 −0 setup.cfg
  7. +7 −2 setup.py
  8. +1,699 −0 versioneer.py
1 change: 1 addition & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
artiq/_version.py export-subst
2 changes: 2 additions & 0 deletions MANIFEST.in
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
graft artiq/runtime
include artiq/gui/icon.png
include versioneer.py
include artiq/_version.py
4 changes: 4 additions & 0 deletions artiq/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -7,3 +7,7 @@
__all__.extend(language.__all__)
__all__ += ["PHASE_MODE_CONTINUOUS", "PHASE_MODE_ABSOLUTE",
"PHASE_MODE_TRACKING"]

from ._version import get_versions
__version__ = get_versions()['version']
del get_versions
Loading