Merge pull request #40 from philipstarkey/master

C-extension removal

Author: chrisjbillington

.gitignore

@@ -1,9 +1,137 @@
-*.pyc
-.eggs
-build
-conda_build
-conda_packages
-dist
-*.egg-info
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
 *.so
-*.c
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# Editors
+.vscode/
+
+# conda build results
+conda_build/
+conda_packages/
+

runviewer/__main__.py

@@ -70,7 +70,7 @@
 process_tree = ProcessTree.instance()
 process_tree.zlock_client.set_process_name('runviewer')
 
-from runviewer.resample import resample as _resample
+from labscript_c_extensions.runviewer.resample import resample as _resample
 
 
 SHOT_MODEL__COLOUR_INDEX = 0

setup.cfg

@@ -29,6 +29,7 @@ install_requires =
   importlib_metadata
   labscript_devices
   labscript_utils>=2.15
+  labscript-c-extensions
   pyqtgraph>=0.11.0rc0
   qtutils>=2.0.0
   zprocess

setup.py

@@ -1,24 +1,9 @@
 import os
 from setuptools import setup
-from setuptools.extension import Extension
-from Cython.Distutils import build_ext
-
-
-CMDCLASS = {"build_ext": build_ext}
-
 
 VERSION_SCHEME = {
     "version_scheme": os.getenv("SCM_VERSION_SCHEME", "guess-next-dev"),
     "local_scheme": os.getenv("SCM_LOCAL_SCHEME", "node-and-date"),
 }
 
-
-EXT_MODULES = [
-    Extension("runviewer.resample", sources=[os.path.join("src", "resample.pyx")])
-]
-
-setup(
-    use_scm_version=VERSION_SCHEME,
-    cmdclass=CMDCLASS,
-    ext_modules=EXT_MODULES,
-)
+setup(use_scm_version=VERSION_SCHEME)