Skip to content

Commit edd00cf

Browse files
committed
Some adjustments for PyPI stuff
1 parent c55c568 commit edd00cf

File tree

4 files changed

+30
-23
lines changed

4 files changed

+30
-23
lines changed

LICENSE LICENSE.txt

File renamed without changes.

THIRDPARTYLICENSES.md

-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
* [ddt](https://github.com/txels/ddt): MIT
7272
* [mock](https://github.com/testing-cabal/mock): BSD
7373
* [nose](http://pythonhosted.org/nose/): LGPL
74-
* [pypandoc](https://github.com/bebraw/pypandoc): MIT
7574
* [Sphinx](http://sphinx-doc.org/): BSD
7675
* [sphinxcontrib-httpdomain](https://bitbucket.org/birkenfeld/sphinx-contrib/src/default/httpdomain/): BSD
7776
* [sphinxcontrib-mermad](https://github.com/mgaitan/sphinxcontrib-mermaid): BSD

setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[metadata]
2-
description-file = README.md
2+
license_file = LICENSE.txt
33

44
[versioneer]
55
VCS = git

setup.py

+29-21
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,6 @@
7474
"sphinxcontrib-httpdomain",
7575
"sphinxcontrib-mermaid>=0.3",
7676
"sphinx_rtd_theme",
77-
78-
# PyPi upload related
79-
"pypandoc"
8077
],
8178

8279
# Dependencies for developing OctoPrint plugins
@@ -94,6 +91,13 @@
9491
#-----------------------------------------------------------------------------------------------------------------------
9592
# Anything below here is just command setup and general setup configuration
9693

94+
here = os.path.abspath(os.path.dirname(__file__))
95+
96+
def read_file_contents(path):
97+
import codecs
98+
with codecs.open(path, encoding="utf-8") as f:
99+
return f.read()
100+
97101
def data_copy_build_py_factory(files, baseclass):
98102
class data_copy_build_py(baseclass):
99103
files = dict()
@@ -149,45 +153,49 @@ def params():
149153
version = versioneer.get_version()
150154
cmdclass = get_cmdclass()
151155

152-
description = "A snappy web interface for 3D printers"
153-
long_description = open("README.md").read()
156+
description = "The snappy web interface for your 3D printer"
157+
long_description = read_file_contents(os.path.join(here, "README.md"))
158+
long_description_content_type = "text/markdown"
154159

155160
install_requires = INSTALL_REQUIRES
156161
extras_require = EXTRA_REQUIRES
157162
dependency_links = DEPENDENCY_LINKS
158163
setup_requires = SETUP_REQUIRES
159164

160-
try:
161-
import pypandoc
162-
setup_requires += ["setuptools-markdown"]
163-
long_description_markdown_filename = "README.md"
164-
del pypandoc
165-
except:
166-
pass
167-
168165
classifiers = [
169-
"Development Status :: 4 - Beta",
166+
"Development Status :: 5 - Production/Stable",
170167
"Environment :: Web Environment",
171168
"Framework :: Flask",
169+
"Intended Audience :: Developers",
172170
"Intended Audience :: Education",
173171
"Intended Audience :: End Users/Desktop",
174172
"Intended Audience :: Manufacturing",
173+
"Intended Audience :: Other Audience",
175174
"Intended Audience :: Science/Research",
176175
"License :: OSI Approved :: GNU Affero General Public License v3",
177176
"Natural Language :: English",
177+
"Natural Language :: German",
178178
"Operating System :: OS Independent",
179+
"Programming Language :: Python",
180+
"Programming Language :: Python :: 2",
179181
"Programming Language :: Python :: 2.7",
182+
"Programming Language :: Python :: Implementation :: CPython",
180183
"Programming Language :: JavaScript",
181-
"Topic :: Internet :: WWW/HTTP",
182-
"Topic :: Internet :: WWW/HTTP :: Dynamic Content",
183-
"Topic :: Internet :: WWW/HTTP :: WSGI",
184184
"Topic :: Printing",
185-
"Topic :: System :: Networking :: Monitoring"
185+
"Topic :: System :: Monitoring"
186186
]
187187
author = "Gina Häußge"
188-
author_email = "[email protected]"
189-
url = "http://octoprint.org"
190-
license = "AGPLv3"
188+
author_email = "[email protected]"
189+
url = "https://octoprint.org"
190+
license = "GNU Affero General Public License v3"
191+
keywords = "3dprinting 3dprinter 3d-printing 3d-printer octoprint"
192+
193+
project_urls={
194+
"Community Forum": "https://discourse.octoprint.org",
195+
"Bug Reports": "https://github.com/foosel/OctoPrint/issues",
196+
"Source": "https://github.com/foosel/OctoPrint",
197+
"Funding": "https://donate.octoprint.org"
198+
}
191199

192200
packages = find_packages(where="src")
193201
package_dir = {

0 commit comments

Comments
 (0)