Environment markers with correct spacing. (#250)

XLSForm · Jan 7, 2019 · 648fd13 · 648fd13
1 parent ed3a220
commit 648fd13
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ python:
  - "3.4"
  - "3.5"
 install:
+ - pip install -U pip setuptools
  - pip install -q -r requirements.pip
 env:
  - "RUNTESTS=nosetests"

diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,5 +1,9 @@
 Pyxform Changelog
 
+v0.12.2, 2019 01 06
+ -- Correct environment marker in requirements.pip
+ [ukanga]
+
 v0.12.1, 2019 01 06
  -- Performance Regression fix on using relative paths.
  Issue #247, https://github.com/XLSForm/pyxform/issues/247

diff --git a/appveyor.yml b/appveyor.yml
@@ -26,7 +26,7 @@ install:
 
  # Upgrade to the latest version of pip to avoid it displaying warnings
  # about it being out of date.
- - ps: python -m pip install -U pip
+ - ps: python -m pip install -U pip setuptools
 
  # We need wheel installed to build wheels
  - ps: pip install wheel

diff --git a/pyxform/__init__.py b/pyxform/__init__.py
@@ -3,7 +3,7 @@
 Collect easy.
 """
 
-__version__ = '0.12.1'
+__version__ = '0.12.2'
 
 from pyxform.builder import (SurveyElementBuilder, create_survey, # noqa
  create_survey_element_from_dict,

diff --git a/requirements.pip b/requirements.pip
@@ -7,4 +7,4 @@ traceback2==1.4.0 # via unittest2
 unicodecsv==0.14.1
 unittest2==1.1.0
 xlrd==1.1.0
-functools32==3.2.3.post2;python_version<"3.2"
+functools32==3.2.3.post2 ; python_version < "3.2"
diff --git a/setup.py b/setup.py
@@ -1,23 +1,19 @@
 # -*- coding: utf-8 -*-
 """Pyxform - Python library that converts XLSForms to XForms.
 """
-import sys
-
 from setuptools import find_packages, setup
 
 REQUIRES = [
  'xlrd>=1.1.0',
  'unicodecsv>=0.14.1',
  'formencode',
  'unittest2',
+ 'functools32==3.2.3.post2 ; python_version < "3.2"',
 ]
 
-if sys.version_info < (3, 2):
- REQUIRES.append('functools32==3.2.3.post2')
-
 setup(
  name='pyxform',
- version='0.12.1',
+ version='0.12.2',
  author='github.com/xlsform',
  author_email='info@xlsform.org',
  packages=find_packages(),