aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Touhey <thomas@touhey.fr>2019-05-12 13:33:14 +0200
committerThomas Touhey <thomas@touhey.fr>2019-05-12 13:33:14 +0200
commit71d92d00bb625a2eb9bf767e81b0b35cd56b9113 (patch)
tree3448eb5999394046d5353c4b69826347784df8b3
parent1727265b45441f142c29b14b92ac1404b2bcd00c (diff)
Corrections and made the builtin module public
-rw-r--r--LICENSE.txt2
-rw-r--r--docs/conf.py4
-rw-r--r--setup.cfg6
-rwxr-xr-xthcolor/__init__.py6
-rwxr-xr-xthcolor/_ref.py2
-rwxr-xr-xthcolor/builtin/__init__.py (renamed from thcolor/_builtin/__init__.py)0
-rwxr-xr-xthcolor/builtin/_css.py (renamed from thcolor/_builtin/_css.py)0
-rwxr-xr-xthcolor/builtin/_default.py (renamed from thcolor/_builtin/_default.py)0
8 files changed, 8 insertions, 12 deletions
diff --git a/LICENSE.txt b/LICENSE.txt
index 45ccebe..d1defab 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,6 @@
The MIT License (MIT)
-Copyright (C) 2018 Thomas Touhey <thomas@touhey.fr>
+Copyright (C) 2018-2019 Thomas Touhey <thomas@touhey.fr>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the “Software”), to deal
diff --git a/docs/conf.py b/docs/conf.py
index d48ebc8..0627b7e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -46,7 +46,7 @@ extensions = [
]
# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = []
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
@@ -64,4 +64,4 @@ html_theme = 'sphinx_rtd_theme'
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = []
diff --git a/setup.cfg b/setup.cfg
index dfd9203..7ff488f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -11,7 +11,8 @@ long_description = file: README.rst
keywords = textout, color, parser, css
license = MIT
classifiers =
- Development Status :: 2 - Pre-Alpha
+ Development Status :: 4 - Beta
+ Natural Language :: English
License :: OSI Approved :: MIT License
Operating System :: OS Independent
Programming Language :: Python :: 3
@@ -21,8 +22,7 @@ classifiers =
[options]
zip_safe = False
include_package_data = True
-packages = thcolor, thcolor._builtin
-test_suite = test
+packages = thcolor, thcolor.builtin
install_requires =
regex
diff --git a/thcolor/__init__.py b/thcolor/__init__.py
index c2c7536..22c8a7e 100755
--- a/thcolor/__init__.py
+++ b/thcolor/__init__.py
@@ -15,13 +15,9 @@ from ._ref import Reference
from ._angle import Angle
from ._exc import ColorExpressionDecodingError
-from ._builtin import (CSS1Reference, CSS2Reference, CSS3Reference,
- CSS4Reference, DefaultReference)
__all__ = ["version", "Color", "Reference", "Angle",
- "ColorExpressionDecodingError",
- "CSS1Reference", "CSS2Reference", "CSS3Reference",
- "CSS4Reference", "DefaultReference"]
+ "ColorExpressionDecodingError"]
version = "0.3.1"
diff --git a/thcolor/_ref.py b/thcolor/_ref.py
index beb97fe..96a9c51 100755
--- a/thcolor/_ref.py
+++ b/thcolor/_ref.py
@@ -425,7 +425,7 @@ class Reference:
if _default_reference is not None:
return _default_reference
- from ._builtin import DefaultReference
+ from .builtin import DefaultReference
_default_reference = DefaultReference()
return _default_reference
diff --git a/thcolor/_builtin/__init__.py b/thcolor/builtin/__init__.py
index c9bc0d2..c9bc0d2 100755
--- a/thcolor/_builtin/__init__.py
+++ b/thcolor/builtin/__init__.py
diff --git a/thcolor/_builtin/_css.py b/thcolor/builtin/_css.py
index 12bb1aa..12bb1aa 100755
--- a/thcolor/_builtin/_css.py
+++ b/thcolor/builtin/_css.py
diff --git a/thcolor/_builtin/_default.py b/thcolor/builtin/_default.py
index bbbf8d1..bbbf8d1 100755
--- a/thcolor/_builtin/_default.py
+++ b/thcolor/builtin/_default.py