pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'maintenance' into devel

Browse source 
Conflicts:
	.versioneer-lookup
	setup.cfg
	src/octoprint/_version.py
	src/octoprint/plugin/types.py
	src/octoprint/util/__init__.py
	versioneer.py
This commit is contained in:
Gina Häußge 2015-10-26 09:23:19 +01:00
commit 55075d40bc
3 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.versioneer-lookup
View file

@ -12,11 +12,11 @@ master
# maintenance is currently the branch for preparation of maintenance release 1.2.8
# so are any fix/... branches
maintenance 1.2.8 6c622f7c4332b71c6ece59552ffc87c146155c84
fix/.* 1.2.8 6c622f7c4332b71c6ece59552ffc87c146155c84
maintenance 1.2.8 6c622f7c4332b71c6ece59552ffc87c146155c84 pep440-dev
fix/.* 1.2.8 6c622f7c4332b71c6ece59552ffc87c146155c84 pep440-dev
# Special case disconnected checkouts, e.g. 'git checkout <tag>'
\(detached.*
# every other branch is a development branch and thus gets resolved to 1.3.0-dev for now
.* 1.3.0 198d3450d94be1a2 pep440-dev
.* 1.3.0 198d3450d94be1a2 pep440-dev

6
setup.cfg
View file

@ -1,7 +1,5 @@
# See the docstring in versioneer.py for instructions. Note that you must
# re-run 'versioneer.py setup' after changing this section, and commit the
# resulting files.
[metadata]
description-file = README.md
[versioneer]
VCS = git

27
setup.py
View file

@ -49,7 +49,10 @@ EXTRA_REQUIRES = dict(
# Documentation dependencies
"sphinx>=1.3",
"sphinxcontrib-httpdomain",
"sphinx_rtd_theme"
"sphinx_rtd_theme",
# PyPi upload related
"pypandoc"
],
# Dependencies for developing OctoPrint plugins
@ -58,6 +61,9 @@ EXTRA_REQUIRES = dict(
]
)
# Additional requirements for setup
SETUP_REQUIRES = []
# Dependency links for any of the aforementioned dependencies
DEPENDENCY_LINKS = []
@ -118,8 +124,22 @@ def params():
version = versioneer.get_version()
cmdclass = get_cmdclass()
description = "A responsive web interface for 3D printers"
description = "A snappy web interface for 3D printers"
long_description = open("README.md").read()
install_requires = INSTALL_REQUIRES
extras_require = EXTRA_REQUIRES
dependency_links = DEPENDENCY_LINKS
setup_requires = SETUP_REQUIRES
try:
import pypandoc
setup_requires += ["setuptools-markdown"]
long_description_markdown_filename = "README.md"
del pypandoc
except:
pass
classifiers = [
"Development Status :: 4 - Beta",
"Environment :: Web Environment",
@ -156,9 +176,6 @@ def params():
include_package_data = True
zip_safe = False
install_requires = INSTALL_REQUIRES
extras_require = EXTRA_REQUIRES
dependency_links = DEPENDENCY_LINKS
if os.environ.get('READTHEDOCS', None) == 'True':
# we can't tell read the docs to please perform a pip install -e .[develop], so we help