Skip to content

pep420 namespace package, add pyproject.toml, bump version #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

pep420 namespace package, add pyproject.toml, bump version #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[build-system]
requires = ["setuptools"]
build-backend = "setuptools.build_meta"

13 changes: 7 additions & 6 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
from xstatic.pkg import jquery_file_upload as xs
import os, sys
setup_dir = os.path.dirname(__file__)
sys.path.insert(0, os.path.join(setup_dir, "xstatic"))
from pkg import jquery_file_upload as xs

# The README.txt file should be written in reST so that PyPI can use
# it to generate your project's PyPI page.
with open('README.txt') as f:
long_description = f.read()

from setuptools import setup, find_packages
from setuptools import setup, find_namespace_packages

setup(
name=xs.PACKAGE_NAME,
Expand All @@ -19,10 +22,8 @@
license=xs.LICENSE,
url=xs.HOMEPAGE,
platforms=xs.PLATFORMS,
packages=find_packages(),
namespace_packages=['xstatic', 'xstatic.pkg', ],
packages=find_namespace_packages(),
include_package_data=True,
zip_safe=False,
install_requires=[], # nothing! :)
# if you like, you MAY use the 'XStatic' package.
install_requires=['XStatic >= 2.0.0, < 3.0.0', 'XStatic-jQuery'],
)
1 change: 0 additions & 1 deletion xstatic/__init__.py
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion xstatic/pkg/__init__.py
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion xstatic/pkg/jquery_file_upload/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

VERSION = '10.31.0' # version of the packaged files, please use the upstream
# version number
BUILD = '1' # our package build number, so we can release new builds
BUILD = '2' # our package build number, so we can release new builds
# with fixes for xstatic stuff.
PACKAGE_VERSION = VERSION + '.' + BUILD # version used for PyPi

Expand Down