Merge pull request #988 from Axelrod-Python/pyparsing

meatballs · web-flow · commit 76d159350316 · 2017-04-23T10:28:15.000+01:00
Remove pin of pyparsing.
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,3 @@
-pyparsing==2.1.1 # Due to https://github.com/Axelrod-Python/Axelrod/issues/584
 numpy>=1.9.2
 matplotlib>=1.4.2
 hypothesis>=3.2
diff --git a/rtd_environment.yml b/rtd_environment.yml
@@ -5,7 +5,6 @@ dependencies:
 - matplotlib>=1.4.2
 - pip:
    - docutils==0.12
-   - pyparsing==2.1.1 # Due to https://github.com/Axelrod-Python/Axelrod/issues/584
    - hypothesis>=3.2
    - tqdm==3.4.0
    - prompt-toolkit>=1.0.7

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-pyparsing==2.1.1 # Due to https://github.com/Axelrod-Python/Axelrod/issues/584`
`2`	`1`	`numpy>=1.9.2`
`3`	`2`	`matplotlib>=1.4.2`
`4`	`3`	`hypothesis>=3.2`