Fix fuzzyset installation (Blazemeter#1437)

Cython is required for build of fuzzyset. Unfortunately both of them can't be installed from requirements the same time due to pip specific logic (build all packages firstly and then install all of them)
g-bhagat · Dec 22, 2020 · 3e9214f · 3e9214f
1 parent 01c18cc
commit 3e9214f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -46,6 +46,7 @@ install:
   fi
 - gem install rspec
 - $PIP_INSTALL --upgrade pip
+- if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$TRAVIS_PYTHON_VERSION" = "3.9" ]; then $PIP_INSTALL Cython; fi
 - $PIP_INSTALL -r requirements.txt -r tests/ci/requirements.txt
 
 before_script:

diff --git a/appveyor.yml b/appveyor.yml
@@ -16,9 +16,10 @@ platform:
   - x64
 
 install:
-  - "%PYTHON%\\python.exe -m pip install pip wheel --upgrade"
+  - "%PYTHON%\\python.exe -m pip install pip wheel Cython --upgrade"
   - "%PYTHON%\\python.exe -m pip install -r requirements.txt -r tests/ci/requirements.txt"
   - set PATH=C:\Ruby22\bin;%PYTHON%\Scripts\;%PATH%
+  - set SSL_CERT_FILE=C:\\ruby24-x64\\ssl\\cert.pem
   - gem install rspec
 
 build: off

diff --git a/fix-bzt-pip.change b/fix-bzt-pip.change
diff --git a/site/dat/docs/Installation.md b/site/dat/docs/Installation.md
@@ -37,8 +37,8 @@ you should utilize the following command line utilities provided by the installe
 
 
 **Important!**
-- You need to install fresh `setuptools` and `wheel` before installing everything else with `bzt-pip`, 
- with the following command: `bzt-pip install setuptools wheel`. 
+- You need to install fresh `setuptools`, `wheel`, and `Cython` before installing everything else with `bzt-pip`, 
+ with the following command: `bzt-pip install setuptools wheel Cython`. 
 
 ### Installing Taurus Manually
 
@@ -91,7 +91,7 @@ NOTE: There is an issue with brew installation connected with numpy. In order to
 To install taurus with pip you need command line developers tools and python 3.6+ installed.
 Then you need to install `cython` if it is not installed using the following command:
 ```
-pip3 install cython
+pip3 install Cython
 ```
 
 Then just install bzt:
@@ -107,7 +107,7 @@ pip3 install --upgrade bzt
 
 ## Linux
 
-You will need Python 3.6+ and Java installed. To install Taurus on Linux, do the following instructions:
+You will need Python 3.7+ and Java installed. To install Taurus on Linux, do the following instructions:
 
 ```
 sudo apt-get update
@@ -178,4 +178,4 @@ UNSTABLE_SNAPSHOT
 
 ## Data Collection Disclaimer
 
-We have [Usage Statisctics](/bzt-usage-stats) on our website. That's why we collect the name of desktop OS, where you have run Taurus.
+We have [Usage Statisctics](/bzt-usage-stats) on our website. That's why we collect the name of desktop OS, where you have run Taurus.
diff --git a/site/dat/docs/changes/fix-fuzzyset-version.change b/site/dat/docs/changes/fix-fuzzyset-version.change
@@ -0,0 +1 @@
+fix ci fail on fuzzyset installation; install cython beforehand
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fix ci fail on fuzzyset installation; install cython beforehand