From 29bc27f557d366382b172bb07190a3d040a04065 Mon Sep 17 00:00:00 2001 From: Rob Cresswell Date: Thu, 14 Jul 2016 09:54:32 -0700 Subject: [PATCH] Update XStatic-MDI to 1.6.50.1 Change-Id: I39a0644c51b231daa4e6e13d29ce5f90893ba40f --- MANIFEST.in | 3 +-- setup.cfg | 20 ++++++++++++++++ setup.py | 28 ++++++++--------------- xstatic/pkg/mdi/__init__.py | 2 +- xstatic/pkg/mdi/data/scss/_functions.scss | 2 +- 5 files changed, 32 insertions(+), 23 deletions(-) create mode 100644 setup.cfg diff --git a/MANIFEST.in b/MANIFEST.in index e89f0c4..af3cdd3 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,5 @@ include README.txt -recursive-include xstatic/pkg/mdi * - +recursive-include xstatic * global-exclude *.pyc global-exclude *.pyo global-exclude *.orig diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..26c5365 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,20 @@ +[metadata] +name = XStatic-mdi +summary = mdi 1.4.57 (XStatic packaging standard) +description-file = README.rst +maintainer = Diana Whitten +maintainer-email = hurgleburgler@gmail.com +home-page = http://materialdesignicons.com +keywords = material design icons webfont mdi xstatic +license = (same as mdi) +zip_safe = False +namespace_packages = + xstatic + xstatic.pkg + +[files] +packages = + xstatic + +[bdist_wheel] +universal = True diff --git a/setup.py b/setup.py index 1903f3e..8be42d1 100644 --- a/setup.py +++ b/setup.py @@ -1,27 +1,17 @@ - -from xstatic.pkg import mdi as xs +from setuptools import setup, find_packages # The README.txt file should be written in reST so that PyPI can use # it to generate your project's PyPI page. long_description = open('README.txt').read() -from setuptools import setup, find_packages - setup( - name=xs.PACKAGE_NAME, - version=xs.PACKAGE_VERSION, - description=xs.DESCRIPTION, - long_description=long_description, - classifiers=xs.CLASSIFIERS, - keywords=xs.KEYWORDS, - maintainer=xs.MAINTAINER, - maintainer_email=xs.MAINTAINER_EMAIL, - license=xs.LICENSE, - url=xs.HOMEPAGE, - platforms=xs.PLATFORMS, + name='XStatic-mdi', + summary="""mdi 1.4.57 (XStatic packaging standard)""", + description=long_description, + maintainer="Diana Whitten", + maintainer_email='hurgleburgler@gmail.com', + use_scm_version=True, + setup_requires=['setuptools_scm', 'wheel'], packages=find_packages(), - namespace_packages=['xstatic', 'xstatic.pkg', ], - include_package_data=True, - zip_safe=False, - install_requires=[], + include_package_data=True ) diff --git a/xstatic/pkg/mdi/__init__.py b/xstatic/pkg/mdi/__init__.py index ff84db7..38dca77 100644 --- a/xstatic/pkg/mdi/__init__.py +++ b/xstatic/pkg/mdi/__init__.py @@ -17,7 +17,7 @@ NAME = __name__.split('.')[-1] # package name (e.g. 'foo' or 'foo_bar') VERSION = '1.6.50' # version of the packaged files, please use the upstream # version number -BUILD = '0' # our package build number, so we can release new builds +BUILD = '1' # our package build number, so we can release new builds # with fixes for xstatic stuff. PACKAGE_VERSION = VERSION + '.' + BUILD # version used for PyPi diff --git a/xstatic/pkg/mdi/data/scss/_functions.scss b/xstatic/pkg/mdi/data/scss/_functions.scss index f454b28..a648f28 100644 --- a/xstatic/pkg/mdi/data/scss/_functions.scss +++ b/xstatic/pkg/mdi/data/scss/_functions.scss @@ -1,4 +1,4 @@ -@function char($character-code) { +@function char($character-code) { @if function-exists("selector-append") { @return unquote("\"\\#{$character-code}\""); }