Skip to content

Commit 936d6a1

Browse files
Merge pull request #55 from chrisjbillington/packaging-changes
Packaging changes
2 parents cdbecc7 + 602b775 commit 936d6a1

File tree

11 files changed

+97
-434
lines changed

11 files changed

+97
-434
lines changed

.gitignore

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
__pycache__
2+
dist
3+
*.egg-info
4+
*eggs
5+
conda_build
6+
conda_packages
7+
*.out
8+
*.log
9+
*.aux
10+
*.toc

.hgignore

Lines changed: 0 additions & 7 deletions
This file was deleted.

README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,5 @@
44
The labscript Python library provides a translation from simple Python code to complex hardware instructions. The library is used to construct a "connection table" containing information about what hardware is being used and how it is interconnected. Devices described in this connection table can then have their outputs set by using a range of functions, including arbitrary ramps.
55

66
(
7-
[view on Bitbucket](https://bitbucket.org/labscript_suite/labscript)
8-
)
9-
10-
* For install instructions, see the [labscript suite install guide](https://bitbucket.org/labscript_suite/install-guide)
7+
[view on Github](https://github.com/labscript-suite/labscript)
8+
)

devices/__init__.py

Lines changed: 0 additions & 13 deletions
This file was deleted.

devices/adwin.py

Lines changed: 0 additions & 361 deletions
This file was deleted.

devices/sr400photoncounter.py

Lines changed: 0 additions & 48 deletions
This file was deleted.

__init__.py renamed to labscript/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@
3939
# elif sys.argv[0]:
4040
# labscript_init(sys.argv[0].replace('.py','.h5'), labscript_file=sys.argv[0], new=True, overwrite=overwrite)
4141

42-
__version__ = '2.6.0'
42+
from .__version__ import __version__

labscript/__version__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
__version__ = '2.7.0.dev0'
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)