diff options
author | TW <tw@waldmann-edv.de> | 2018-09-18 19:41:44 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-18 19:41:44 +0200 |
commit | ba77400d647d3e59ccb0df14fda35afe14132b19 (patch) | |
tree | 140b5d45aa7a30f490827b58083f0ba1836be6fe | |
parent | 22c70888d19317169c03c4d430e963e792c1202f (diff) | |
parent | bbef923567ab119fa97ad9fcc268584947309141 (diff) | |
download | xstatic-git-ba77400d647d3e59ccb0df14fda35afe14132b19.tar.gz |
Merge pull request #2 from ThomasWaldmann/master
updates
-rw-r--r-- | .gitignore | 9 | ||||
-rw-r--r-- | .hgignore | 9 | ||||
-rw-r--r-- | LICENSE.txt | 2 | ||||
-rw-r--r-- | README.txt | 10 | ||||
-rw-r--r-- | docs/source/conf.py | 2 | ||||
-rw-r--r-- | docs/source/packaging.rst | 4 | ||||
-rw-r--r-- | setup.py | 18 | ||||
-rw-r--r-- | xstatic/__init__.py | 2 | ||||
-rw-r--r-- | xstatic/main.py | 2 | ||||
-rw-r--r-- | xstatic/pkg/__init__.py | 2 |
10 files changed, 33 insertions, 27 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8ee47bb --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +MANIFEST +docs/_build +build/ +dist/ +*.egg-info +*.pyc +.idea/ +.cache/ +.eggs/ diff --git a/.hgignore b/.hgignore deleted file mode 100644 index eaa6b42..0000000 --- a/.hgignore +++ /dev/null @@ -1,9 +0,0 @@ -.*\.py[co]$ -^dist/ -^XStatic.egg-info/ -^docs/_build/ -^MANIFEST$ -.DS_Store -.orig$ -.rej$ -.~$ diff --git a/LICENSE.txt b/LICENSE.txt index 577e9a2..9a6033e 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2011-2014 Thomas Waldmann <tw AT waldmann-edv DOT de> and +Copyright (c) 2011-2018 Thomas Waldmann <tw AT waldmann-edv DOT de> and other contributors, see AUTHORS.txt. Permission is hereby granted, free of charge, to any person obtaining a copy @@ -6,9 +6,15 @@ with minimal overhead - without selling you some dependencies you don't want. XStatic has some minimal support code for working with the XStatic-* packages. -Docs: http://readthedocs.org/docs/xstatic/en/latest/ +Docs: https://xstatic.readthedocs.io/ -Repository: https://bitbucket.org/thomaswaldmann/xstatic +Repository: https://github.com/xstatic-py/xstatic (base package) + +Find more stuff already packaged as xstatic package there: + +https://github.com/xstatic-py/ + +https://pypi.org/search/?q=xstatic Licenses: diff --git a/docs/source/conf.py b/docs/source/conf.py index 06b0f77..ff3e960 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -41,7 +41,7 @@ master_doc = 'index' # General information about the project. project = u'XStatic' -copyright = u'2011-2014, Thomas Waldmann' +copyright = u'2011-2018, Thomas Waldmann' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff --git a/docs/source/packaging.rst b/docs/source/packaging.rst index 9b0b78b..33e6a31 100644 --- a/docs/source/packaging.rst +++ b/docs/source/packaging.rst @@ -29,8 +29,8 @@ steps: This file's content will also be shown as long description on PyPi. Please note that this file is written in reST markup, so that PyPi can generate your project's page from it. -* If you use Mercurial, update .hgignore so it ignores: - ^XStatic_FooBar.egg-info/ +* If you use git (Mercurial), update .gitignore (.hgignore) so it ignores: + XStatic_FooBar.egg-info * Review all the stuff you did, make sure you did not forget anything, make sure there is no jquery reference left. * Run python setup.py sdist. @@ -1,25 +1,25 @@ -# Copyright: 2011-2014 by the XStatic authors, see AUTHORS.txt for details. +# Copyright: 2011-2018 by the XStatic authors, see AUTHORS.txt for details. # License: MIT license, see LICENSE.txt for details. """ XStatic - setup.py - -Works with: setuptools """ -import os.path +import os + +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. -readme_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), - 'README.txt') +readme_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'README.txt') + with open(readme_path) as f: long_description = f.read() -from setuptools import setup, find_packages setup( name='XStatic', - version='1.0.1', + version='1.0.2', description='XStatic base package with minimal support code', long_description=long_description, classifiers=[ @@ -36,7 +36,7 @@ setup( keywords="xstatic static file resource python packages setuptools pypi require", author='Thomas Waldmann', author_email='tw@waldmann-edv.de', - url='http:/bitbucket.org/thomaswaldmann/xstatic', + url='https://github.com/xstatic-py/xstatic', license='MIT license', packages=find_packages(), namespace_packages=['xstatic', 'xstatic.pkg', ], diff --git a/xstatic/__init__.py b/xstatic/__init__.py index 22d1bc4..28c0fc3 100644 --- a/xstatic/__init__.py +++ b/xstatic/__init__.py @@ -1,4 +1,4 @@ -# Copyright: 2011-2014 by the XStatic authors, see AUTHORS.txt for details. +# Copyright: 2011-2018 by the XStatic authors, see AUTHORS.txt for details. # License: MIT license, see LICENSE.txt for details. __import__('pkg_resources').declare_namespace(__name__) diff --git a/xstatic/main.py b/xstatic/main.py index 7e25a0a..bcec803 100644 --- a/xstatic/main.py +++ b/xstatic/main.py @@ -1,4 +1,4 @@ -# Copyright: 2011-2014 by the XStatic authors, see AUTHORS.txt for details. +# Copyright: 2011-2018 by the XStatic authors, see AUTHORS.txt for details. # License: MIT license, see LICENSE.txt for details. """ diff --git a/xstatic/pkg/__init__.py b/xstatic/pkg/__init__.py index 22d1bc4..28c0fc3 100644 --- a/xstatic/pkg/__init__.py +++ b/xstatic/pkg/__init__.py @@ -1,4 +1,4 @@ -# Copyright: 2011-2014 by the XStatic authors, see AUTHORS.txt for details. +# Copyright: 2011-2018 by the XStatic authors, see AUTHORS.txt for details. # License: MIT license, see LICENSE.txt for details. __import__('pkg_resources').declare_namespace(__name__) |