From 0b8a34fb9611ac399b6c148b48d3e9f0ea567914 Mon Sep 17 00:00:00 2001 From: "Michael D. M. Dryden" <mdryden@chem.utoronto.ca> Date: Mon, 11 Aug 2014 17:42:44 -0400 Subject: [PATCH] Transition to Editra project. --- .gitignore | 4 ++- .../__init__.py => dstat-interface/CHANGELOG | 0 dstat-interface/LICENSE | 0 dstat-interface/README | 0 dstat-interface/dstat-interface.psp | 6 +++++ dstat-interface/dstat-interface/__init__.py | 0 .../dstat-interface}/build_windows.py | 0 .../drivers/VirtualSerial.inf | 0 .../dstatInterface.xcodeproj/project.pbxproj | 0 .../contents.xcworkspacedata | 0 .../xcshareddata/dstatInterface.xccheckout | 0 .../xcschemes/dstatInterface.xcscheme | 0 .../xcschemes/xcschememanagement.plist | 0 .../dstat-interface}/dstat_comm.py | 0 .../dstat-interface}/glade1.py | 0 .../dstat-interface/interface/__init__.py | 0 .../dstat-interface}/interface/acv.glade | 0 .../dstat-interface}/interface/acv.py | 0 .../dstat-interface}/interface/adc_pot.glade | 0 .../dstat-interface}/interface/adc_pot.py | 0 .../interface/chronoamp.glade | 0 .../dstat-interface}/interface/chronoamp.py | 0 .../dstat-interface}/interface/cv.glade | 0 .../dstat-interface}/interface/cv.py | 0 .../dstat-interface}/interface/dpv.glade | 0 .../dstat-interface}/interface/dpv.py | 0 .../interface/dstatinterface.glade | 0 .../dstat-interface}/interface/lsv.glade | 0 .../dstat-interface}/interface/lsv.py | 0 .../dstat-interface}/interface/pd.glade | 0 .../dstat-interface}/interface/pd.py | 0 .../dstat-interface}/interface/save.py | 0 .../dstat-interface}/interface/swv.glade | 0 .../dstat-interface}/interface/swv.py | 0 .../dstat-interface}/interface_test.py | 0 .../dstat-interface/interface_test.spec | 25 +++++++++++++++++++ .../dstat-interface/interface_test.spec.bak | 0 .../dstat-interface}/microdrop.py | 0 .../dstat-interface}/mpl.py | 0 .../dstat-interface}/mpltest.py | 0 .../dstat-interface}/setup.py | 0 dstat-interface/setup.py | 0 42 files changed, 34 insertions(+), 1 deletion(-) rename dstatInterface/interface/__init__.py => dstat-interface/CHANGELOG (100%) create mode 100644 dstat-interface/LICENSE create mode 100644 dstat-interface/README create mode 100644 dstat-interface/dstat-interface.psp create mode 100644 dstat-interface/dstat-interface/__init__.py rename {dstatInterface => dstat-interface/dstat-interface}/build_windows.py (100%) rename {dstatInterface => dstat-interface/dstat-interface}/drivers/VirtualSerial.inf (100%) rename {dstatInterface => dstat-interface/dstat-interface}/dstatInterface.xcodeproj/project.pbxproj (100%) rename {dstatInterface => dstat-interface/dstat-interface}/dstatInterface.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) rename {dstatInterface => dstat-interface/dstat-interface}/dstatInterface.xcodeproj/project.xcworkspace/xcshareddata/dstatInterface.xccheckout (100%) rename {dstatInterface => dstat-interface/dstat-interface}/dstatInterface.xcodeproj/xcuserdata/mdryden.xcuserdatad/xcschemes/dstatInterface.xcscheme (100%) rename {dstatInterface => dstat-interface/dstat-interface}/dstatInterface.xcodeproj/xcuserdata/mdryden.xcuserdatad/xcschemes/xcschememanagement.plist (100%) rename {dstatInterface => dstat-interface/dstat-interface}/dstat_comm.py (100%) rename {dstatInterface => dstat-interface/dstat-interface}/glade1.py (100%) create mode 100644 dstat-interface/dstat-interface/interface/__init__.py rename {dstatInterface => dstat-interface/dstat-interface}/interface/acv.glade (100%) rename {dstatInterface => dstat-interface/dstat-interface}/interface/acv.py (100%) rename {dstatInterface => dstat-interface/dstat-interface}/interface/adc_pot.glade (100%) rename {dstatInterface => dstat-interface/dstat-interface}/interface/adc_pot.py (100%) rename {dstatInterface => dstat-interface/dstat-interface}/interface/chronoamp.glade (100%) rename {dstatInterface => dstat-interface/dstat-interface}/interface/chronoamp.py (100%) rename {dstatInterface => dstat-interface/dstat-interface}/interface/cv.glade (100%) rename {dstatInterface => dstat-interface/dstat-interface}/interface/cv.py (100%) rename {dstatInterface => dstat-interface/dstat-interface}/interface/dpv.glade (100%) rename {dstatInterface => dstat-interface/dstat-interface}/interface/dpv.py (100%) rename {dstatInterface => dstat-interface/dstat-interface}/interface/dstatinterface.glade (100%) rename {dstatInterface => dstat-interface/dstat-interface}/interface/lsv.glade (100%) rename {dstatInterface => dstat-interface/dstat-interface}/interface/lsv.py (100%) rename {dstatInterface => dstat-interface/dstat-interface}/interface/pd.glade (100%) rename {dstatInterface => dstat-interface/dstat-interface}/interface/pd.py (100%) rename {dstatInterface => dstat-interface/dstat-interface}/interface/save.py (100%) rename {dstatInterface => dstat-interface/dstat-interface}/interface/swv.glade (100%) rename {dstatInterface => dstat-interface/dstat-interface}/interface/swv.py (100%) rename {dstatInterface => dstat-interface/dstat-interface}/interface_test.py (100%) create mode 100644 dstat-interface/dstat-interface/interface_test.spec rename dstatInterface/interface_test.spec => dstat-interface/dstat-interface/interface_test.spec.bak (100%) rename {dstatInterface => dstat-interface/dstat-interface}/microdrop.py (100%) rename {dstatInterface => dstat-interface/dstat-interface}/mpl.py (100%) rename {dstatInterface => dstat-interface/dstat-interface}/mpltest.py (100%) rename {dstatInterface => dstat-interface/dstat-interface}/setup.py (100%) create mode 100644 dstat-interface/setup.py diff --git a/.gitignore b/.gitignore index e6133b7..8df98e2 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,6 @@ Breakpoints_v2.xcbkptlist *.pyc *~ /dstatInterface/dist/ -/dstatInterface/build/ \ No newline at end of file +/dstatInterface/build/ +/dstat-interface/dstat-interface/dist/ +/dstat-interface/dstat-interface/build/ \ No newline at end of file diff --git a/dstatInterface/interface/__init__.py b/dstat-interface/CHANGELOG similarity index 100% rename from dstatInterface/interface/__init__.py rename to dstat-interface/CHANGELOG diff --git a/dstat-interface/LICENSE b/dstat-interface/LICENSE new file mode 100644 index 0000000..e69de29 diff --git a/dstat-interface/README b/dstat-interface/README new file mode 100644 index 0000000..e69de29 diff --git a/dstat-interface/dstat-interface.psp b/dstat-interface/dstat-interface.psp new file mode 100644 index 0000000..b18557a --- /dev/null +++ b/dstat-interface/dstat-interface.psp @@ -0,0 +1,6 @@ +<?xml version="1.0" ?> +<project name="dstat-interface" version="1.0"> + <optionset name="general"/> + <package name="dstat-interface"/> + <folder name="tests"/> +</project> diff --git a/dstat-interface/dstat-interface/__init__.py b/dstat-interface/dstat-interface/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dstatInterface/build_windows.py b/dstat-interface/dstat-interface/build_windows.py similarity index 100% rename from dstatInterface/build_windows.py rename to dstat-interface/dstat-interface/build_windows.py diff --git a/dstatInterface/drivers/VirtualSerial.inf b/dstat-interface/dstat-interface/drivers/VirtualSerial.inf similarity index 100% rename from dstatInterface/drivers/VirtualSerial.inf rename to dstat-interface/dstat-interface/drivers/VirtualSerial.inf diff --git a/dstatInterface/dstatInterface.xcodeproj/project.pbxproj b/dstat-interface/dstat-interface/dstatInterface.xcodeproj/project.pbxproj similarity index 100% rename from dstatInterface/dstatInterface.xcodeproj/project.pbxproj rename to dstat-interface/dstat-interface/dstatInterface.xcodeproj/project.pbxproj diff --git a/dstatInterface/dstatInterface.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/dstat-interface/dstat-interface/dstatInterface.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from dstatInterface/dstatInterface.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to dstat-interface/dstat-interface/dstatInterface.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/dstatInterface/dstatInterface.xcodeproj/project.xcworkspace/xcshareddata/dstatInterface.xccheckout b/dstat-interface/dstat-interface/dstatInterface.xcodeproj/project.xcworkspace/xcshareddata/dstatInterface.xccheckout similarity index 100% rename from dstatInterface/dstatInterface.xcodeproj/project.xcworkspace/xcshareddata/dstatInterface.xccheckout rename to dstat-interface/dstat-interface/dstatInterface.xcodeproj/project.xcworkspace/xcshareddata/dstatInterface.xccheckout diff --git a/dstatInterface/dstatInterface.xcodeproj/xcuserdata/mdryden.xcuserdatad/xcschemes/dstatInterface.xcscheme b/dstat-interface/dstat-interface/dstatInterface.xcodeproj/xcuserdata/mdryden.xcuserdatad/xcschemes/dstatInterface.xcscheme similarity index 100% rename from dstatInterface/dstatInterface.xcodeproj/xcuserdata/mdryden.xcuserdatad/xcschemes/dstatInterface.xcscheme rename to dstat-interface/dstat-interface/dstatInterface.xcodeproj/xcuserdata/mdryden.xcuserdatad/xcschemes/dstatInterface.xcscheme diff --git a/dstatInterface/dstatInterface.xcodeproj/xcuserdata/mdryden.xcuserdatad/xcschemes/xcschememanagement.plist b/dstat-interface/dstat-interface/dstatInterface.xcodeproj/xcuserdata/mdryden.xcuserdatad/xcschemes/xcschememanagement.plist similarity index 100% rename from dstatInterface/dstatInterface.xcodeproj/xcuserdata/mdryden.xcuserdatad/xcschemes/xcschememanagement.plist rename to dstat-interface/dstat-interface/dstatInterface.xcodeproj/xcuserdata/mdryden.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/dstatInterface/dstat_comm.py b/dstat-interface/dstat-interface/dstat_comm.py similarity index 100% rename from dstatInterface/dstat_comm.py rename to dstat-interface/dstat-interface/dstat_comm.py diff --git a/dstatInterface/glade1.py b/dstat-interface/dstat-interface/glade1.py similarity index 100% rename from dstatInterface/glade1.py rename to dstat-interface/dstat-interface/glade1.py diff --git a/dstat-interface/dstat-interface/interface/__init__.py b/dstat-interface/dstat-interface/interface/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dstatInterface/interface/acv.glade b/dstat-interface/dstat-interface/interface/acv.glade similarity index 100% rename from dstatInterface/interface/acv.glade rename to dstat-interface/dstat-interface/interface/acv.glade diff --git a/dstatInterface/interface/acv.py b/dstat-interface/dstat-interface/interface/acv.py similarity index 100% rename from dstatInterface/interface/acv.py rename to dstat-interface/dstat-interface/interface/acv.py diff --git a/dstatInterface/interface/adc_pot.glade b/dstat-interface/dstat-interface/interface/adc_pot.glade similarity index 100% rename from dstatInterface/interface/adc_pot.glade rename to dstat-interface/dstat-interface/interface/adc_pot.glade diff --git a/dstatInterface/interface/adc_pot.py b/dstat-interface/dstat-interface/interface/adc_pot.py similarity index 100% rename from dstatInterface/interface/adc_pot.py rename to dstat-interface/dstat-interface/interface/adc_pot.py diff --git a/dstatInterface/interface/chronoamp.glade b/dstat-interface/dstat-interface/interface/chronoamp.glade similarity index 100% rename from dstatInterface/interface/chronoamp.glade rename to dstat-interface/dstat-interface/interface/chronoamp.glade diff --git a/dstatInterface/interface/chronoamp.py b/dstat-interface/dstat-interface/interface/chronoamp.py similarity index 100% rename from dstatInterface/interface/chronoamp.py rename to dstat-interface/dstat-interface/interface/chronoamp.py diff --git a/dstatInterface/interface/cv.glade b/dstat-interface/dstat-interface/interface/cv.glade similarity index 100% rename from dstatInterface/interface/cv.glade rename to dstat-interface/dstat-interface/interface/cv.glade diff --git a/dstatInterface/interface/cv.py b/dstat-interface/dstat-interface/interface/cv.py similarity index 100% rename from dstatInterface/interface/cv.py rename to dstat-interface/dstat-interface/interface/cv.py diff --git a/dstatInterface/interface/dpv.glade b/dstat-interface/dstat-interface/interface/dpv.glade similarity index 100% rename from dstatInterface/interface/dpv.glade rename to dstat-interface/dstat-interface/interface/dpv.glade diff --git a/dstatInterface/interface/dpv.py b/dstat-interface/dstat-interface/interface/dpv.py similarity index 100% rename from dstatInterface/interface/dpv.py rename to dstat-interface/dstat-interface/interface/dpv.py diff --git a/dstatInterface/interface/dstatinterface.glade b/dstat-interface/dstat-interface/interface/dstatinterface.glade similarity index 100% rename from dstatInterface/interface/dstatinterface.glade rename to dstat-interface/dstat-interface/interface/dstatinterface.glade diff --git a/dstatInterface/interface/lsv.glade b/dstat-interface/dstat-interface/interface/lsv.glade similarity index 100% rename from dstatInterface/interface/lsv.glade rename to dstat-interface/dstat-interface/interface/lsv.glade diff --git a/dstatInterface/interface/lsv.py b/dstat-interface/dstat-interface/interface/lsv.py similarity index 100% rename from dstatInterface/interface/lsv.py rename to dstat-interface/dstat-interface/interface/lsv.py diff --git a/dstatInterface/interface/pd.glade b/dstat-interface/dstat-interface/interface/pd.glade similarity index 100% rename from dstatInterface/interface/pd.glade rename to dstat-interface/dstat-interface/interface/pd.glade diff --git a/dstatInterface/interface/pd.py b/dstat-interface/dstat-interface/interface/pd.py similarity index 100% rename from dstatInterface/interface/pd.py rename to dstat-interface/dstat-interface/interface/pd.py diff --git a/dstatInterface/interface/save.py b/dstat-interface/dstat-interface/interface/save.py similarity index 100% rename from dstatInterface/interface/save.py rename to dstat-interface/dstat-interface/interface/save.py diff --git a/dstatInterface/interface/swv.glade b/dstat-interface/dstat-interface/interface/swv.glade similarity index 100% rename from dstatInterface/interface/swv.glade rename to dstat-interface/dstat-interface/interface/swv.glade diff --git a/dstatInterface/interface/swv.py b/dstat-interface/dstat-interface/interface/swv.py similarity index 100% rename from dstatInterface/interface/swv.py rename to dstat-interface/dstat-interface/interface/swv.py diff --git a/dstatInterface/interface_test.py b/dstat-interface/dstat-interface/interface_test.py similarity index 100% rename from dstatInterface/interface_test.py rename to dstat-interface/dstat-interface/interface_test.py diff --git a/dstat-interface/dstat-interface/interface_test.spec b/dstat-interface/dstat-interface/interface_test.spec new file mode 100644 index 0000000..1a9c7fe --- /dev/null +++ b/dstat-interface/dstat-interface/interface_test.spec @@ -0,0 +1,25 @@ +# -*- mode: python -*- +a = Analysis(['./interface_test.py'], + pathex=['/Users/mdryden/src/dstat-interface2/dstatInterface'], + hiddenimports=[], + hookspath=None, + runtime_hooks=None) +pyz = PYZ(a.pure) +exe = EXE(pyz, + a.scripts, + exclude_binaries=True, + name='interface_test', + debug=False, + strip=None, + upx=True, + console=False ) +coll = COLLECT(exe, + a.binaries, + a.zipfiles, + a.datas, + strip=None, + upx=True, + name='interface_test') +app = BUNDLE(coll, + name='interface_test.app', + icon=None) diff --git a/dstatInterface/interface_test.spec b/dstat-interface/dstat-interface/interface_test.spec.bak similarity index 100% rename from dstatInterface/interface_test.spec rename to dstat-interface/dstat-interface/interface_test.spec.bak diff --git a/dstatInterface/microdrop.py b/dstat-interface/dstat-interface/microdrop.py similarity index 100% rename from dstatInterface/microdrop.py rename to dstat-interface/dstat-interface/microdrop.py diff --git a/dstatInterface/mpl.py b/dstat-interface/dstat-interface/mpl.py similarity index 100% rename from dstatInterface/mpl.py rename to dstat-interface/dstat-interface/mpl.py diff --git a/dstatInterface/mpltest.py b/dstat-interface/dstat-interface/mpltest.py similarity index 100% rename from dstatInterface/mpltest.py rename to dstat-interface/dstat-interface/mpltest.py diff --git a/dstatInterface/setup.py b/dstat-interface/dstat-interface/setup.py similarity index 100% rename from dstatInterface/setup.py rename to dstat-interface/dstat-interface/setup.py diff --git a/dstat-interface/setup.py b/dstat-interface/setup.py new file mode 100644 index 0000000..e69de29 -- GitLab