From 2902f8df4a4528804ba87a59c9b6be38d9763e75 Mon Sep 17 00:00:00 2001 From: "Michael D. M. Dryden" Date: Wed, 13 May 2015 19:04:49 -0400 Subject: [PATCH] remove extra directory layer --- .gitignore | 6 ++---- dstat-interface/LICENSE => LICENSE | 0 dstat-interface/README => README | 0 dstat-interface/{dstat-interface => }/__init__.py | 0 dstat-interface/{dstat-interface => }/build_windows.py | 0 .../{dstat-interface => }/drivers/VirtualSerial.inf | 0 dstat-interface/{dstat-interface => }/dstat.spec | 0 .../dstatInterface.xcodeproj/project.pbxproj | 0 .../project.xcworkspace/contents.xcworkspacedata | 0 .../xcshareddata/dstatInterface.xccheckout | 0 .../mdryden.xcuserdatad/xcschemes/dstatInterface.xcscheme | 0 .../mdryden.xcuserdatad/xcschemes/xcschememanagement.plist | 0 dstat-interface/{dstat-interface => }/dstat_comm.py | 0 dstat-interface/{dstat-interface => }/errors.py | 0 dstat-interface/{dstat-interface => }/interface/__init__.py | 0 dstat-interface/{dstat-interface => }/interface/acv.glade | 0 .../{dstat-interface => }/interface/adc_pot.glade | 0 dstat-interface/{dstat-interface => }/interface/adc_pot.py | 0 .../{dstat-interface => }/interface/chronoamp.glade | 0 dstat-interface/{dstat-interface => }/interface/cv.glade | 0 dstat-interface/{dstat-interface => }/interface/dpv.glade | 0 .../{dstat-interface => }/interface/dstatinterface.glade | 0 dstat-interface/{dstat-interface => }/interface/exp_int.py | 0 .../{dstat-interface => }/interface/exp_window.py | 0 dstat-interface/{dstat-interface => }/interface/lsv.glade | 0 dstat-interface/{dstat-interface => }/interface/pd.glade | 0 .../{dstat-interface => }/interface/potexp.glade | 0 dstat-interface/{dstat-interface => }/interface/save.py | 0 dstat-interface/{dstat-interface => }/interface/swv.glade | 0 .../{dstat-interface => }/interface_test.spec.bak | 0 dstat-interface/{dstat-interface => }/main.py | 0 dstat-interface/{dstat-interface => }/microdrop.py | 0 dstat-interface/{dstat-interface => }/plot.py | 0 dstat-interface/{dstat-interface => }/setup.py | 0 34 files changed, 2 insertions(+), 4 deletions(-) rename dstat-interface/LICENSE => LICENSE (100%) rename dstat-interface/README => README (100%) rename dstat-interface/{dstat-interface => }/__init__.py (100%) rename dstat-interface/{dstat-interface => }/build_windows.py (100%) rename dstat-interface/{dstat-interface => }/drivers/VirtualSerial.inf (100%) rename dstat-interface/{dstat-interface => }/dstat.spec (100%) rename dstat-interface/{dstat-interface => }/dstatInterface.xcodeproj/project.pbxproj (100%) rename dstat-interface/{dstat-interface => }/dstatInterface.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) rename dstat-interface/{dstat-interface => }/dstatInterface.xcodeproj/project.xcworkspace/xcshareddata/dstatInterface.xccheckout (100%) rename dstat-interface/{dstat-interface => }/dstatInterface.xcodeproj/xcuserdata/mdryden.xcuserdatad/xcschemes/dstatInterface.xcscheme (100%) rename dstat-interface/{dstat-interface => }/dstatInterface.xcodeproj/xcuserdata/mdryden.xcuserdatad/xcschemes/xcschememanagement.plist (100%) rename dstat-interface/{dstat-interface => }/dstat_comm.py (100%) rename dstat-interface/{dstat-interface => }/errors.py (100%) rename dstat-interface/{dstat-interface => }/interface/__init__.py (100%) rename dstat-interface/{dstat-interface => }/interface/acv.glade (100%) rename dstat-interface/{dstat-interface => }/interface/adc_pot.glade (100%) rename dstat-interface/{dstat-interface => }/interface/adc_pot.py (100%) rename dstat-interface/{dstat-interface => }/interface/chronoamp.glade (100%) rename dstat-interface/{dstat-interface => }/interface/cv.glade (100%) rename dstat-interface/{dstat-interface => }/interface/dpv.glade (100%) rename dstat-interface/{dstat-interface => }/interface/dstatinterface.glade (100%) rename dstat-interface/{dstat-interface => }/interface/exp_int.py (100%) rename dstat-interface/{dstat-interface => }/interface/exp_window.py (100%) rename dstat-interface/{dstat-interface => }/interface/lsv.glade (100%) rename dstat-interface/{dstat-interface => }/interface/pd.glade (100%) rename dstat-interface/{dstat-interface => }/interface/potexp.glade (100%) rename dstat-interface/{dstat-interface => }/interface/save.py (100%) rename dstat-interface/{dstat-interface => }/interface/swv.glade (100%) rename dstat-interface/{dstat-interface => }/interface_test.spec.bak (100%) rename dstat-interface/{dstat-interface => }/main.py (100%) rename dstat-interface/{dstat-interface => }/microdrop.py (100%) rename dstat-interface/{dstat-interface => }/plot.py (100%) rename dstat-interface/{dstat-interface => }/setup.py (100%) diff --git a/.gitignore b/.gitignore index bc74534..e6d04b4 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,5 @@ Breakpoints_v2.xcbkptlist *.pyc *.pyo *~ -/dstatInterface/dist/ -/dstatInterface/build/ -/dstat-interface/dstat-interface/dist/ -/dstat-interface/dstat-interface/build/ \ No newline at end of file +/dstat-interface/dist/ +/dstat-interface/build/ \ No newline at end of file diff --git a/dstat-interface/LICENSE b/LICENSE similarity index 100% rename from dstat-interface/LICENSE rename to LICENSE diff --git a/dstat-interface/README b/README similarity index 100% rename from dstat-interface/README rename to README diff --git a/dstat-interface/dstat-interface/__init__.py b/dstat-interface/__init__.py similarity index 100% rename from dstat-interface/dstat-interface/__init__.py rename to dstat-interface/__init__.py diff --git a/dstat-interface/dstat-interface/build_windows.py b/dstat-interface/build_windows.py similarity index 100% rename from dstat-interface/dstat-interface/build_windows.py rename to dstat-interface/build_windows.py diff --git a/dstat-interface/dstat-interface/drivers/VirtualSerial.inf b/dstat-interface/drivers/VirtualSerial.inf similarity index 100% rename from dstat-interface/dstat-interface/drivers/VirtualSerial.inf rename to dstat-interface/drivers/VirtualSerial.inf diff --git a/dstat-interface/dstat-interface/dstat.spec b/dstat-interface/dstat.spec similarity index 100% rename from dstat-interface/dstat-interface/dstat.spec rename to dstat-interface/dstat.spec diff --git a/dstat-interface/dstat-interface/dstatInterface.xcodeproj/project.pbxproj b/dstat-interface/dstatInterface.xcodeproj/project.pbxproj similarity index 100% rename from dstat-interface/dstat-interface/dstatInterface.xcodeproj/project.pbxproj rename to dstat-interface/dstatInterface.xcodeproj/project.pbxproj diff --git a/dstat-interface/dstat-interface/dstatInterface.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/dstat-interface/dstatInterface.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from dstat-interface/dstat-interface/dstatInterface.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to dstat-interface/dstatInterface.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/dstat-interface/dstat-interface/dstatInterface.xcodeproj/project.xcworkspace/xcshareddata/dstatInterface.xccheckout b/dstat-interface/dstatInterface.xcodeproj/project.xcworkspace/xcshareddata/dstatInterface.xccheckout similarity index 100% rename from dstat-interface/dstat-interface/dstatInterface.xcodeproj/project.xcworkspace/xcshareddata/dstatInterface.xccheckout rename to dstat-interface/dstatInterface.xcodeproj/project.xcworkspace/xcshareddata/dstatInterface.xccheckout diff --git a/dstat-interface/dstat-interface/dstatInterface.xcodeproj/xcuserdata/mdryden.xcuserdatad/xcschemes/dstatInterface.xcscheme b/dstat-interface/dstatInterface.xcodeproj/xcuserdata/mdryden.xcuserdatad/xcschemes/dstatInterface.xcscheme similarity index 100% rename from dstat-interface/dstat-interface/dstatInterface.xcodeproj/xcuserdata/mdryden.xcuserdatad/xcschemes/dstatInterface.xcscheme rename to dstat-interface/dstatInterface.xcodeproj/xcuserdata/mdryden.xcuserdatad/xcschemes/dstatInterface.xcscheme diff --git a/dstat-interface/dstat-interface/dstatInterface.xcodeproj/xcuserdata/mdryden.xcuserdatad/xcschemes/xcschememanagement.plist b/dstat-interface/dstatInterface.xcodeproj/xcuserdata/mdryden.xcuserdatad/xcschemes/xcschememanagement.plist similarity index 100% rename from dstat-interface/dstat-interface/dstatInterface.xcodeproj/xcuserdata/mdryden.xcuserdatad/xcschemes/xcschememanagement.plist rename to dstat-interface/dstatInterface.xcodeproj/xcuserdata/mdryden.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/dstat-interface/dstat-interface/dstat_comm.py b/dstat-interface/dstat_comm.py similarity index 100% rename from dstat-interface/dstat-interface/dstat_comm.py rename to dstat-interface/dstat_comm.py diff --git a/dstat-interface/dstat-interface/errors.py b/dstat-interface/errors.py similarity index 100% rename from dstat-interface/dstat-interface/errors.py rename to dstat-interface/errors.py diff --git a/dstat-interface/dstat-interface/interface/__init__.py b/dstat-interface/interface/__init__.py similarity index 100% rename from dstat-interface/dstat-interface/interface/__init__.py rename to dstat-interface/interface/__init__.py diff --git a/dstat-interface/dstat-interface/interface/acv.glade b/dstat-interface/interface/acv.glade similarity index 100% rename from dstat-interface/dstat-interface/interface/acv.glade rename to dstat-interface/interface/acv.glade diff --git a/dstat-interface/dstat-interface/interface/adc_pot.glade b/dstat-interface/interface/adc_pot.glade similarity index 100% rename from dstat-interface/dstat-interface/interface/adc_pot.glade rename to dstat-interface/interface/adc_pot.glade diff --git a/dstat-interface/dstat-interface/interface/adc_pot.py b/dstat-interface/interface/adc_pot.py similarity index 100% rename from dstat-interface/dstat-interface/interface/adc_pot.py rename to dstat-interface/interface/adc_pot.py diff --git a/dstat-interface/dstat-interface/interface/chronoamp.glade b/dstat-interface/interface/chronoamp.glade similarity index 100% rename from dstat-interface/dstat-interface/interface/chronoamp.glade rename to dstat-interface/interface/chronoamp.glade diff --git a/dstat-interface/dstat-interface/interface/cv.glade b/dstat-interface/interface/cv.glade similarity index 100% rename from dstat-interface/dstat-interface/interface/cv.glade rename to dstat-interface/interface/cv.glade diff --git a/dstat-interface/dstat-interface/interface/dpv.glade b/dstat-interface/interface/dpv.glade similarity index 100% rename from dstat-interface/dstat-interface/interface/dpv.glade rename to dstat-interface/interface/dpv.glade diff --git a/dstat-interface/dstat-interface/interface/dstatinterface.glade b/dstat-interface/interface/dstatinterface.glade similarity index 100% rename from dstat-interface/dstat-interface/interface/dstatinterface.glade rename to dstat-interface/interface/dstatinterface.glade diff --git a/dstat-interface/dstat-interface/interface/exp_int.py b/dstat-interface/interface/exp_int.py similarity index 100% rename from dstat-interface/dstat-interface/interface/exp_int.py rename to dstat-interface/interface/exp_int.py diff --git a/dstat-interface/dstat-interface/interface/exp_window.py b/dstat-interface/interface/exp_window.py similarity index 100% rename from dstat-interface/dstat-interface/interface/exp_window.py rename to dstat-interface/interface/exp_window.py diff --git a/dstat-interface/dstat-interface/interface/lsv.glade b/dstat-interface/interface/lsv.glade similarity index 100% rename from dstat-interface/dstat-interface/interface/lsv.glade rename to dstat-interface/interface/lsv.glade diff --git a/dstat-interface/dstat-interface/interface/pd.glade b/dstat-interface/interface/pd.glade similarity index 100% rename from dstat-interface/dstat-interface/interface/pd.glade rename to dstat-interface/interface/pd.glade diff --git a/dstat-interface/dstat-interface/interface/potexp.glade b/dstat-interface/interface/potexp.glade similarity index 100% rename from dstat-interface/dstat-interface/interface/potexp.glade rename to dstat-interface/interface/potexp.glade diff --git a/dstat-interface/dstat-interface/interface/save.py b/dstat-interface/interface/save.py similarity index 100% rename from dstat-interface/dstat-interface/interface/save.py rename to dstat-interface/interface/save.py diff --git a/dstat-interface/dstat-interface/interface/swv.glade b/dstat-interface/interface/swv.glade similarity index 100% rename from dstat-interface/dstat-interface/interface/swv.glade rename to dstat-interface/interface/swv.glade diff --git a/dstat-interface/dstat-interface/interface_test.spec.bak b/dstat-interface/interface_test.spec.bak similarity index 100% rename from dstat-interface/dstat-interface/interface_test.spec.bak rename to dstat-interface/interface_test.spec.bak diff --git a/dstat-interface/dstat-interface/main.py b/dstat-interface/main.py similarity index 100% rename from dstat-interface/dstat-interface/main.py rename to dstat-interface/main.py diff --git a/dstat-interface/dstat-interface/microdrop.py b/dstat-interface/microdrop.py similarity index 100% rename from dstat-interface/dstat-interface/microdrop.py rename to dstat-interface/microdrop.py diff --git a/dstat-interface/dstat-interface/plot.py b/dstat-interface/plot.py similarity index 100% rename from dstat-interface/dstat-interface/plot.py rename to dstat-interface/plot.py diff --git a/dstat-interface/dstat-interface/setup.py b/dstat-interface/setup.py similarity index 100% rename from dstat-interface/dstat-interface/setup.py rename to dstat-interface/setup.py -- GitLab