Skip to content
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.

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

Fix setup.py sdist related issues and use only __version__ #73

Merged
merged 1 commit into from
Feb 19, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 0 additions & 6 deletions MANIFEST

This file was deleted.

3 changes: 1 addition & 2 deletions MANIFEST.in
Expand Up @@ -2,5 +2,4 @@ include LICENSE
include README.rst
include setup.cfg
include requirements.txt
# None of these exist
# recursive-include django_nyt *.html *.txt *.png *.js *.css *.gif *.less *.mo *.po *.otf *.svg *.woff *.eot *.ttf
recursive-include django_nyt *.html *.js *.mo *.po
1 change: 1 addition & 0 deletions Makefile
Expand Up @@ -50,6 +50,7 @@ release: clean sdist
twine upload -s dist/*

sdist: clean
cd django_nyt && django-admin compilemessages
python setup.py sdist
python setup.py bdist_wheel
ls -l dist
3 changes: 1 addition & 2 deletions django_nyt/__init__.py
@@ -1,7 +1,6 @@
_disable_notifications = False

VERSION = "1.1b1"
__version__ = VERSION
__version__ = "1.1b1"

default_app_config = "django_nyt.apps.DjangoNytConfig"

Expand Down
3 changes: 2 additions & 1 deletion docs/release_notes.rst
Expand Up @@ -12,14 +12,15 @@ New features
Bug fixes
^^^^^^^^^

* ...
* Restored missing translation files :url-issue:`73`

Deprecations
^^^^^^^^^^^^

* Django < 1.11 support is dropped :url-issue:`62`
* Python < 3.4 support is dropped :url-issue:`65` and :url-issue:`68`
* Deprecate ``django_nyt.urls.get_pattern``, use ``include('django_nyt.urls')`` instead :url-issue:`63`
* Removed ``django_nyt.VERSION``, use `django_nyt.__version__` instead :url-issue:`73`

1.0
---
Expand Down
12 changes: 8 additions & 4 deletions setup.py
@@ -1,25 +1,29 @@
import os
from django_nyt import VERSION
from setuptools import setup, find_packages

from setuptools import find_packages, setup

from django_nyt import __version__


def get_path(fname):
return os.path.join(os.path.dirname(os.path.abspath(__file__)), fname)

def read(fname):
return open(get_path(fname)).read()


packages = find_packages()

setup(
name="django-nyt",
version=VERSION,
version=__version__,
author="Benjamin Bach",
author_email="benjamin@overtag.dk",
url="https://github.com/benjaoming/django-nyt",
description="A pluggable notification system written for the Django framework.",
license="Apache License 2.0",
keywords=["django", "notification" "alerts"],
packages=find_packages(exclude=["testproject", "testproject.*"]),
packages=find_packages(),
zip_safe=False,
install_requires=read('requirements.txt').split("\n"),
classifiers=[
Expand Down