summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRocky Meza <rocky@fusionbox.com>2015-04-22 16:04:10 -0600
committerRocky Meza <rocky@fusionbox.com>2015-04-22 16:06:59 -0600
commit313c0e02b8d7b43ab534dd2491e07e37deeb17d3 (patch)
tree04945b8fa9c33c4d2067d31edc04d8906d04a39e
parentfa4e73fe5bc1ce7cb1ded96d194a7d2461f6e59a (diff)
downloaddjango-pyscss-313c0e02b8d7b43ab534dd2491e07e37deeb17d3.tar.gz
Back to development: 2.0.0
-rw-r--r--CHANGELOG.rst6
-rw-r--r--setup.py15
2 files changed, 8 insertions, 13 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 57155ad..2c863c7 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,12 @@ CHANGELOG
---------
+2.0.0 (unreleased)
+==================
+
+- Nothing changed yet.
+
+
1.0.0 - 2014-02-11
==================
diff --git a/setup.py b/setup.py
index e5fcda5..265e772 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,5 @@
#!/usr/bin/env python
from setuptools import setup, find_packages
-import subprocess
import os
__doc__ = "Makes it easier to use PySCSS in Django."
@@ -21,22 +20,12 @@ tests_require = [
]
-version = (1, 1, 0, 'alpha')
+version = '2.0.0.dev0'
-def get_version():
- number = '.'.join(map(str, version[:3]))
- stage = version[3]
- if stage == 'final':
- return number
- elif stage == 'alpha':
- process = subprocess.Popen('git rev-parse HEAD'.split(), stdout=subprocess.PIPE)
- stdout, stderr = process.communicate()
- return number + '-' + stdout.strip()[:8]
-
setup(
name='django-pyscss',
- version=get_version(),
+ version=version,
author="Fusionbox, Inc.",
author_email="programmers@fusionbox.com",
url="https://github.com/fusionbox/django-pyscss",