Skip to content

Commit

Permalink
Merge pull request #328 from edx/ned/remove-versioneer
Browse files Browse the repository at this point in the history
Remove versioneer as a tool. Use literal version numbers.
  • Loading branch information
nedbat committed Dec 7, 2015
2 parents 17956e7 + 902d6f4 commit 0bd7c2c
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 1,105 deletions.
1 change: 0 additions & 1 deletion .gitattributes

This file was deleted.

2 changes: 0 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,2 +0,0 @@
include versioneer.py
include xblock/_version.py
10 changes: 6 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -189,17 +189,19 @@ Please do not report security issues in public. Please email security@edx.org
Packaging
---------

To package a new release, first tag the commit to be released
To package a new release:

#. Update the version number in setup.py and xblock/__init__.py.

#. Tag the commit to be released::

$VERSION=0.5
git tag -a -m "XBlock version $VERSION" xblock-$VERSION

then upload to PyPI
#. Upload to PyPI::

make package

All of the heavy lifting is handled by python-versioneer (https://github.com/warner/python-versioneer)


Mailing List and IRC Channel
----------------------------
Expand Down
2 changes: 1 addition & 1 deletion pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ profile=no

# Add files or directories to the blacklist. They should be base names, not
# paths.
ignore=CVS, migrations, versioneer.py, _version.py
ignore=CVS, migrations

# Pickle collected data for later comparisons.
persistent=yes
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ rednose=1

[pep8]
ignore=E501,E402
exclude=doc/*,versioneer.py,xblock/_version.py
exclude=doc/*
10 changes: 1 addition & 9 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
"""Set up for XBlock"""
from setuptools import setup

import versioneer
versioneer.VCS = 'git'
versioneer.versionfile_source = 'xblock/_version.py'
versioneer.versionfile_build = 'xblock/_version.py'
versioneer.tag_prefix = 'xblock-' # tags are like 1.2.0
versioneer.parentdir_prefix = 'XBlock-' # dirname like 'myproject-1.2.0'

setup(
name='XBlock',
version=versioneer.get_version(),
cmdclass=versioneer.get_cmdclass(),
version="0.4.3",
description='XBlock Core Library',
packages=[
'xblock',
Expand Down

0 comments on commit 0bd7c2c

Please sign in to comment.