DiamondLightSource · thomascobb · Jun 23, 2021 · Feb 23, 2021 · Feb 25, 2021 · Feb 26, 2021
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+*/_version_git.py export-subst
diff --git a/.gitignore b/.gitignore
@@ -1,11 +1,17 @@
-/bin
-/dbd
-/lib
-/db
-/docs/html
-/pythonIoc
+/.vscode
+/venv
 *.pyc
-O.*
+/docs/html/
+/softioc/_extension.*
+
+# Dist build output
+/build
+/dist
+/softioc.egg-info/
+
+# Coverage reports
+.coverage
+cov.xml
 
 /docs/papers/*/*.aux
 /docs/papers/*/*.pdf

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "iocStats"]
+	path = softioc/iocStats
+	url = https://github.com/epics-modules/iocStats.git
diff --git a/Makefile b/Makefile
diff --git a/Pipfile b/Pipfile
@@ -0,0 +1,22 @@
+[[source]]
+name = "pypi"
+url = "https://pypi.org/simple"
+verify_ssl = true
+
+[dev-packages]
+pytest-cov = "*"
+pytest-flake8 = "*"
+sphinx-rtd-theme = "*"
+# switch to main repo after PR https://github.com/Holzhaus/sphinx-multiversion/pull/60 is merged
+sphinx-multiversion = {editable = true,git = "https://github.com/dls-controls/sphinx-multiversion.git",ref = "only-arg"}
+setuptools-dso = "*"
+
+[packages]
+# All other package requirements from setup.py
+softioc = {editable = true,path = "."}
+
+[scripts]
+# Put coverage here so we don't interfere with debugging in the IDE
+tests = "python -m pytest --cov=epicsdbbuilder --cov-report term"
+docs = "sphinx-build -EWT --keep-going docs build/html"
+clean = "rm -rf build prefix */__pycache__ .coverage cov.xml *.egg-info .mypy_cache .pytest_cache"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/configure/CONFIG b/configure/CONFIG
diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE
diff --git a/configure/Makefile b/configure/Makefile
diff --git a/configure/RELEASE b/configure/RELEASE
diff --git a/configure/RULES b/configure/RULES
diff --git a/configure/RULES.ioc b/configure/RULES.ioc
diff --git a/configure/RULES_DIRS b/configure/RULES_DIRS
diff --git a/configure/RULES_TOP b/configure/RULES_TOP
diff --git a/example/runtest b/example/runtest
diff --git a/example/versions.py b/example/versions.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools", "wheel", "setuptools_dso", "epicscorelibs>=7.0.4.99.0.0a1"]
+build-backend = "setuptools.build_meta"
diff --git a/python/Makefile b/python/Makefile
diff --git a/python/softioc/__init__.py b/python/softioc/__init__.py
diff --git a/python/softioc/pvlog.py b/python/softioc/pvlog.py
diff --git a/pythonIoc.in b/pythonIoc.in
diff --git a/setup.cfg b/setup.cfg
@@ -0,0 +1,50 @@
+[metadata]
+name = softioc
+description = EPICS IOC with Python Device Support
+url = https://github.com/dls-controls/pythonIoc
+author = Michael Abbott
+author_email = Michael.Abbott@diamond.ac.uk
+license = Apache License 2.0
+long_description = file: README.rst
+long_description_content_type = text/x-rst
+classifiers =
+    Development Status :: 5 - Production/Stable
+    License :: OSI Approved :: Apache Software License
+    Programming Language :: Python :: 2.7
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
+
+[options]
+packages = find:
+
+[options.packages.find]
+# Don't include our test directory in the distribution
+exclude = tests
+
+[options.entry_points]
+# Include a command line script
+console_scripts =
+    pythonIoc = softioc.__main__:main
+
+[options.package_data]
+softioc =
+    softioc/access.acf
+    softioc/device.dbd
+    softioc/iocStats/devIocStats/src/devIocStats.dbd
+    softioc/iocStats/iocAdmin/Db/*.template
+
+[flake8]
+max-line-length = 80
+extend-ignore =
+    F401 F403 F405  # Allow from module import *
+    E251  # Allow call(param = value)
+    E301 E302 E303 E305 # Allow any number of blank lines
+
+[tool:pytest]
+# Run pytest with all our checkers, and don't spam us with massive tracebacks on error
+addopts = --tb=native -vv --flake8 --doctest-modules
+
+[coverage:run]
+# This is covered in the versiongit test suite so exclude it here
+omit = */_version_git.py