Skip to content

Commit

Permalink
Merge pull request #105 from Unidata/sdistfix2
Browse files Browse the repository at this point in the history
add 'setup.py clean_cython' before 'sdist' in README.release, bump
  • Loading branch information
jswhit authored Dec 5, 2018
2 parents 207b2ff + 54e7a07 commit 14f96f2
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 5 deletions.
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ include README.md
include COPYING
recursive-include cftime *.py
recursive-include cftime *.pyx
recursive-exclude cftime *.c
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Time-handling functionality from netcdf4-python
[![Commits Status](https://img.shields.io/github/commits-since/UniData/cftime/latest.svg)](https://github.com/UniData/cftime/commits/master)

## News
12/05/2018: version 1.0.3.3 released (just to fix a problem with the source
12/05/2018: version 1.0.3.4 released (just to fix a problem with the source
tarball on pypi).

12/05/2018: version 1.0.3.1 released. Bugfix release (fixed issue with installation
Expand Down
5 changes: 4 additions & 1 deletion README.release
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@
macos x, linux and windows).
* Download the binary wheels from wheels.scipy.org, put them in a
directory called 'upload'. Create a source tarball using
'python setup.py sdist', also put in the 'upload' directory.
% python setup.py clean
% python setup.py clean_cython
% python setup.py sdist
Add the source tarball to the 'upload' directory.
* upload the release files to pypi with twine
(twine upload upload/*). This will require creating a ~/.pypirc
file with your pypi login credentials.
2 changes: 1 addition & 1 deletion cftime/_cftime.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ cdef int[13] _spm_366day = [0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 33
_rop_lookup = {Py_LT: '__gt__', Py_LE: '__ge__', Py_EQ: '__eq__',
Py_GT: '__lt__', Py_GE: '__le__', Py_NE: '__ne__'}

__version__ = '1.0.3.3'
__version__ = '1.0.3.4'

# Adapted from http://delete.me.uk/2005/03/iso8601.html
# Note: This regex ensures that all ISO8601 timezone formats are accepted - but, due to legacy support for other timestrings, not all incorrect formats can be rejected.
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


BASEDIR = os.path.abspath(os.path.dirname(__file__))
CMD_CLEAN = 'clean'
CMDS_NOCYTHONIZE = ['clean','clean_cython','sdist']
COMPILER_DIRECTIVES = {}
DEFINE_MACROS = None
FLAG_COVERAGE = '--cython-coverage' # custom flag enabling Cython line tracing
Expand Down Expand Up @@ -83,7 +83,7 @@ def description():
print('enable: "linetrace" Cython compiler directive')

# See https://github.com/Unidata/cftime/issues/91
if CMD_CLEAN in sys.argv or 'sdist' in sys.argv:
if any([arg in CMDS_NOCYTHONIZE for arg in sys.argv]):
ext_modules = []
else:
extension = Extension('{}._{}'.format(NAME, NAME),
Expand Down

0 comments on commit 14f96f2

Please sign in to comment.