Commit 1104d509 authored by Andrew Quinn's avatar Andrew Quinn
Browse files

Merge branch '74-bump-to-v1-4-0' into 'master' 

Hotfix for versions

Closes #74

See merge request !81
parents ae1d84f7 23d01626

Makefile

+5 −0
Original line number Diff line number Diff line
@@ -38,4 +38,9 @@ install-python3: all-python3 
spell:

	codespell -s --ignore-words=ignore_words.txt `find . -type f -name \*.py`



# Make single reqs file for readthedocs

# https://github.com/readthedocs/readthedocs.org/issues/1112

reqs:

	cat requirements.txt requirements_dev.txt > requirements_rtd.txt



.PHONY: clean doc doc-html all all-python3 test3 testv3 pythonarch install-python3 codespell

doc/source/conf.py

+2 −2
Original line number Diff line number Diff line
@@ -68,9 +68,9 @@ author = 'Andrew Quinn, Mark Hymers' 
# built documents.

#

# The short X.Y version.

version = '1.2'

version = '1.4'

# The full version, including alpha/beta/rc tags.

release = '1.2.0'

release = '1.4.0'



# The language for content autogenerated by Sphinx. Refer to documentation

# for a list of supported languages.

setup.py

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ reqs = (HERE / "requirements.txt").read_text() 
dev_reqs = (HERE / "requirements_dev.txt").read_text()



name = 'sails'

version = '1.2'

release = '1.2.0'

version = '1.4'

release = '1.4.0'



setup(

    name=name,