Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make pythonIoc pip installable #5

Merged
merged 19 commits into from
Jun 23, 2021
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*/_version_git.py export-subst
20 changes: 13 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "iocStats"]
path = softioc/iocStats
url = https://github.com/epics-modules/iocStats.git
46 changes: 0 additions & 46 deletions Makefile

This file was deleted.

22 changes: 22 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -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"
491 changes: 491 additions & 0 deletions Pipfile.lock

Large diffs are not rendered by default.

30 changes: 0 additions & 30 deletions configure/CONFIG

This file was deleted.

20 changes: 0 additions & 20 deletions configure/CONFIG_SITE

This file was deleted.

8 changes: 0 additions & 8 deletions configure/Makefile

This file was deleted.

27 changes: 0 additions & 27 deletions configure/RELEASE

This file was deleted.

7 changes: 0 additions & 7 deletions configure/RULES

This file was deleted.

2 changes: 0 additions & 2 deletions configure/RULES.ioc

This file was deleted.

2 changes: 0 additions & 2 deletions configure/RULES_DIRS

This file was deleted.

3 changes: 0 additions & 3 deletions configure/RULES_TOP

This file was deleted.

3 changes: 0 additions & 3 deletions example/runtest

This file was deleted.

8 changes: 0 additions & 8 deletions example/versions.py

This file was deleted.

3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools", "wheel", "setuptools_dso", "epicscorelibs>=7.0.4.99.0.0a1"]
build-backend = "setuptools.build_meta"
thomascobb marked this conversation as resolved.
Show resolved Hide resolved
7 changes: 0 additions & 7 deletions python/Makefile

This file was deleted.

1 change: 0 additions & 1 deletion python/softioc/__init__.py

This file was deleted.

10 changes: 0 additions & 10 deletions python/softioc/pvlog.py

This file was deleted.

41 changes: 0 additions & 41 deletions pythonIoc.in

This file was deleted.

50 changes: 50 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -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 = [email protected]
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
Loading