Changeset fc25457 in sasview


Ignore:
Timestamp:
Apr 9, 2018 9:44:02 AM (2 years ago)
Author:
GitHub <noreply@…>
Branches:
master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload
Children:
94f074c4
Parents:
b09aee8 (diff), c16172d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Wojciech Potrzebowski <Wojciech.Potrzebowski@…> (04/09/18 09:44:02)
git-committer:
GitHub <noreply@…> (04/09/18 09:44:02)
Message:

Merge pull request #150 from llimeht/tmp/pyparsing-version

Drop incorrect version req on pyparsing

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • build_tools/requirements.txt

    r36ca21e rc16172d  
    33pylint 
    44unittest-xml-reporting==1.10.0 
    5 pyparsing==1.5.5 
     5pyparsing>=2.0 
    66html5lib==0.95 
    77reportlab==2.5 
  • setup.py

    r1a3602d rc16172d  
    402402 
    403403required = [ 
    404     'bumps>=0.7.5.9', 'periodictable>=1.5.0', 'pyparsing<2.0.0', 
     404    'bumps>=0.7.5.9', 'periodictable>=1.5.0', 'pyparsing>=2.0.0', 
    405405 
    406406    # 'lxml>=2.2.2', 
Note: See TracChangeset for help on using the changeset viewer.