Skip to content

Commit

Permalink
Merge pull request #2 from ThomasWaldmann/master
Browse files Browse the repository at this point in the history
updates
  • Loading branch information
ThomasWaldmann committed Sep 18, 2018
2 parents 22c7088 + bbef923 commit ba77400
Show file tree
Hide file tree
Showing 10 changed files with 33 additions and 27 deletions.
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
MANIFEST
docs/_build
build/
dist/
*.egg-info
*.pyc
.idea/
.cache/
.eggs/
9 changes: 0 additions & 9 deletions .hgignore

This file was deleted.

2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 8 additions & 2 deletions README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

# 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
Expand Down
4 changes: 2 additions & 2 deletions docs/source/packaging.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
18 changes: 9 additions & 9 deletions setup.py
Original file line number Diff line number Diff line change
@@ -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=[
Expand All @@ -36,7 +36,7 @@
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', ],
Expand Down
2 changes: 1 addition & 1 deletion xstatic/__init__.py
Original file line number Diff line number Diff line change
@@ -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__)
2 changes: 1 addition & 1 deletion xstatic/main.py
Original file line number Diff line number Diff line change
@@ -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.

"""
Expand Down
2 changes: 1 addition & 1 deletion xstatic/pkg/__init__.py
Original file line number Diff line number Diff line change
@@ -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__)

0 comments on commit ba77400

Please sign in to comment.