diff --git a/.hgignore b/.hgignore deleted file mode 100644 index 5f79125..0000000 --- a/.hgignore +++ /dev/null @@ -1,5 +0,0 @@ -syntax:glob -dist -build -tests/*.svg -docs/_build diff --git a/svg/charts/__init__.py b/pygal/__init__.py similarity index 100% rename from svg/charts/__init__.py rename to pygal/__init__.py diff --git a/svg/charts/bar.css b/pygal/bar.css similarity index 100% rename from svg/charts/bar.css rename to pygal/bar.css diff --git a/svg/charts/bar.py b/pygal/bar.py similarity index 100% rename from svg/charts/bar.py rename to pygal/bar.py diff --git a/svg/charts/css.py b/pygal/css.py similarity index 100% rename from svg/charts/css.py rename to pygal/css.py diff --git a/svg/charts/graph.css b/pygal/graph.css similarity index 100% rename from svg/charts/graph.css rename to pygal/graph.css diff --git a/svg/charts/graph.py b/pygal/graph.py similarity index 95% rename from svg/charts/graph.py rename to pygal/graph.py index 69b5364..f4867a3 100644 --- a/svg/charts/graph.py +++ b/pygal/graph.py @@ -13,8 +13,8 @@ import pkg_resources import functools import cssutils + from lxml import etree -from xml import xpath from pygal import css # causes the SVG profile to be loaded @@ -612,13 +612,13 @@ class Graph(object): # do nothing return - styles = self.parse_css() - for node in xpath.Evaluate('//*[@class]', self.root): - cl = node.getAttribute('class') - style = styles[cl] - if node.hasAttribute('style'): - style += node.getAttribute('style') - node.setAttribute('style', style) + # styles = self.parse_css() + # for node in xpath.Evaluate('//*[@class]', self.root): + # cl = node.getAttribute('class') + # style = styles[cl] + # if node.hasAttribute('style'): + # style += node.getAttribute('style') + # node.setAttribute('style', style) def parse_css(self): """ diff --git a/svg/charts/line.py b/pygal/line.py similarity index 100% rename from svg/charts/line.py rename to pygal/line.py diff --git a/svg/charts/pie.css b/pygal/pie.css similarity index 100% rename from svg/charts/pie.css rename to pygal/pie.css diff --git a/svg/charts/pie.py b/pygal/pie.py similarity index 100% rename from svg/charts/pie.py rename to pygal/pie.py diff --git a/svg/charts/plot.css b/pygal/plot.css similarity index 100% rename from svg/charts/plot.css rename to pygal/plot.css diff --git a/svg/charts/plot.py b/pygal/plot.py similarity index 100% rename from svg/charts/plot.py rename to pygal/plot.py diff --git a/svg/charts/schedule.py b/pygal/schedule.py similarity index 100% rename from svg/charts/schedule.py rename to pygal/schedule.py diff --git a/svg/charts/time_series.py b/pygal/time_series.py similarity index 100% rename from svg/charts/time_series.py rename to pygal/time_series.py diff --git a/svg/charts/util.py b/pygal/util.py similarity index 100% rename from svg/charts/util.py rename to pygal/util.py diff --git a/setup.py b/setup.py index ae1a224..36a4170 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,6 @@ dateutil_req = ( setup_params = dict( name="pygal", - use_hg_version=True, description="Python svg graph abstract layer", long_description=_long_description, author="Jason R. Coombs, Kozea", @@ -34,7 +33,6 @@ setup_params = dict( url="https://github.com/Kozea/pygal", packages=find_packages(), zip_safe=True, - namespace_packages=['pygal'], include_package_data=True, install_requires=[ 'cssutils>=0.9.8a3', diff --git a/svg/__init__.py b/svg/__init__.py deleted file mode 100644 index 2e2033b..0000000 --- a/svg/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -# this is a namespace package -try: - import pkg_resources - pkg_resources.declare_namespace(__name__) -except ImportError: - import pkgutil - __path__ = pkgutil.extend_path(__path__, __name__)