From da47c10394d0a4308e32175d27d715751b73e1df Mon Sep 17 00:00:00 2001 From: eltrompetero Date: Fri, 8 Jan 2021 14:55:13 -0700 Subject: [PATCH] setup bugs check for boost library version doesn't work like it did previously updated version --- README.md | 8 +++++--- RELEASE_NOTES | 6 +++++- coniii/version.py | 2 +- setup.py | 3 +-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 8152a4d..efd3fbf 100755 --- a/README.md +++ b/README.md @@ -27,10 +27,12 @@ $ conda install -c conda-forge boost==1.74 $ pip install coniii ``` If you have trouble using `pip`, then you can always build this package from -source. Download the latest release from GitHub. Make sure that you are running Python -3.8.3 or higher and have boost v1.74.0 installed. Inside the top directory "coniii", you -must run +source. The following code will down download the latest release from GitHub and install +the package. Make sure that you are running Python 3.8.3 or higher and have boost v1.74.0 +installed. ```bash +$ git clone https://github.com/eltrompetero/coniii.git +$ cd coniii $ ./pypi_compile.sh $ pip install dist/*.whl ``` diff --git a/RELEASE_NOTES b/RELEASE_NOTES index c2a7a4e..8b2a46c 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -23,7 +23,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -v2.4.0 (TB Released 2021/01) +v2.4.1 (Released 2021/01) +---------------------------------------------------- +- Fixed new bugs in installation scripts. + +v2.4.0 (Released 2021/01) ---------------------------------------------------- - Update for Python 3.8.3 and Boost 1.74.0. - New SparseEnumerate class for handling sparsely constrained system. diff --git a/coniii/version.py b/coniii/version.py index fb71ce0..466353d 100644 --- a/coniii/version.py +++ b/coniii/version.py @@ -19,4 +19,4 @@ # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -version = '2.4.0' +version = '2.4.1' diff --git a/setup.py b/setup.py index f7b8a29..b06a9b9 100644 --- a/setup.py +++ b/setup.py @@ -92,8 +92,7 @@ 'numpy>=1.16.2,<2', 'numba>=0.45.1,<1', 'mpmath>=1.1.0', - 'dill', - 'boost==1.74.0'], + 'dill'], 'include_package_data':True, # see MANIFEST.in 'py_modules':['coniii.enumerate', 'coniii.enumerate_potts',