Commit Graph

167 Commits

Author SHA1 Message Date
Stuart Mitchell 8042fdc846 version bump 2017-07-17 10:34:51 +12:00
Stuart Mitchell 60ee1c791f Fix for new gurobi release 2017-07-17 10:28:20 +12:00
Stuart Mitchell ad21e5272c Version 1.6.7 2017-07-17 10:27:17 +12:00
Stuart Mitchell 8cf4bd8fb7 merge problems fixes https://github.com/coin-or/pulp/issues/139 2017-07-11 10:25:12 +12:00
Stuart Mitchell a0b9bb16ee version bump 2017-07-09 19:33:01 +12:00
Stuart Mitchell f757697645 Fix the gurobi issue (#138)
does this by ignoring any line starting with a #
2017-07-09 19:28:07 +12:00
Stuart Mitchell b442668228 Merge branch 'ryanjoneil-pickling-state-fixes' 2017-07-09 16:19:57 +12:00
Stuart Mitchell 79499c93bb Merge branch 'pickling-state-fixes' of git://github.com/ryanjoneil/pulp into ryanjoneil-pickling-state-fixes 2017-07-09 16:12:38 +12:00
Timo Korvola 4126f3c281 Fix CoinMP slacks and tests (#105)
* Correct slack values in COINMP_DLL.

* Fix some test trouble.

When dumping the test problem after an error, swallow exceptions
so that we can raise the original test error.

* Fix more test trouble.

I don't know why the tests expect any solver to put up with repeated
names.  Add COINMP_DLL and CPLEX_DLL to the long list of those that
don't.

* Python 3 compatible use of print.
2017-07-09 16:05:35 +12:00
Ryan Kersh 106bafa461 Fix issue #129 (#134)
* Fix issue #129

With CPLEX 12.7.1 the class variables that were used previously for
CplexLpStatus are only available as instance variables. Here, we move
the definition of CplexLpStatus into findSolutionValues. This should
be backwards compatible with older version of CPLEX as well.

* Remove Python 3.2 from Travis CI config

Due to a change in setuptools python 3.2 is no longer supported.
2017-07-09 15:07:59 +12:00
s-c-e b90bf2428d Fix issue #133: avoid file naming collisions by using uuids instead of pids (#137)
* Fix issue #133: avoid file naming collisions by using uuids instead of pids

* Removed Python 3.2 from Travis CI config file
2017-07-09 15:06:10 +12:00
Stuart Mitchell 6c4b217d55 Merge pull request #130 from bryant1410/master
Fix broken headings in Markdown files
2017-04-18 10:37:00 +12:00
Santiago Castro 8eac7f30c6 Fix broken Markdown headings 2017-04-17 07:34:52 -03:00
Stuart Mitchell 3cafc61861 version bump and change summary to allow pypi upload 2017-02-24 00:06:19 +13:00
Stuart Mitchell 70cb75294d version bump 2017-02-23 23:57:00 +13:00
Stuart Mitchell eacfee1d3c fix for unicode issue with 2.7.13 2017-02-12 22:41:36 +13:00
Stuart Mitchell 95c6c9aee9 Merge pull request #119 from blechta/use-subprocess32
Use thread-safe subprocess32 on Py2
2017-02-06 23:59:18 +13:00
Stuart Mitchell a9ff0aca84 Merge pull request #96 from ryanjoneil/silent-objective-overwrite
pulp.LpProblem issues a warning on implicit overwrite of previously set objective function.
2017-02-06 23:05:47 +13:00
Stuart Mitchell b74301ef15 Merge pull request #98 from ryanjoneil/scip-solver
Add interface to the SCIP solver
2017-02-06 23:02:27 +13:00
Stuart Mitchell cc66011e9f Merge pull request #116 from oprypin/no-flashing
Prevent flashing windows on Windows
2017-02-06 22:58:18 +13:00
Stuart Mitchell ce5c3f5893 version bump 2017-02-06 22:56:51 +13:00
Stuart Mitchell adfb1ae6e2 Merge pull request #117 from oprypin/one-dummy
Don't write duplicate dummy constraints
2017-02-06 22:54:44 +13:00
Stuart Mitchell d4984e5a34 version bump for release 2017-02-06 22:26:54 +13:00
Jan Blechta 31ace18e1c Use thread-safe subprocess32 on Py2 2016-12-08 14:30:48 +01:00
Oleh Prypin c6ccc2246c Prevent flashing windows on Windows 2016-11-28 00:13:43 +02:00
Oleh Prypin 5ddb97f4fd Don't write duplicate dummy constraints
Fixes #115
2016-11-27 22:23:29 +02:00
Stuart Mitchell 8d63ae1ac5 Merge pull request #107 from dims/fix-pyparsing-version
Remove pyparsing version check from setup.py
2016-06-08 08:15:39 +09:00
Davanum Srinivas 01f1f98df1 Remove pyparsing version check from setup.py
Variation of:
https://github.com/coin-or/pulp/pull/100

new versions of pyparsing (>=2.0.1) work with python 2.x and 3.x
http://pyparsing.wikispaces.com/News
2016-05-31 19:21:19 -04:00
Stuart Mitchell eb374541f6 Merge pull request #103 from Xytreyum/master
Update pulp.py
2016-04-22 09:54:19 +12:00
Stuart Mitchell 99cc6603b7 Merge pull request #93 from japborst/master
Fixed allcombinations() docstr
2016-04-22 09:53:37 +12:00
Stuart Mitchell 695cffca07 Merge pull request #106 from fmars/master
adding Xpress solver config support
2016-04-22 09:45:46 +12:00
fjc d69904ef67 remove .DS files 2016-04-20 22:24:44 -07:00
fjc c4adbb1856 adding Xpress solver config support 2016-04-20 13:14:00 -07:00
Mathias Veenman 5fc594a553 Update pulp.py
there was a typo in the description (lowbound vs lowBound) for LpVariable.dicts. Fixed now
2016-03-17 10:44:05 +01:00
Ryan J. O'Neil aac2fc3f24 #85: 'is None' should be 'is not None' 2015-12-29 08:43:47 -05:00
Ryan J. O'Neil 28cea532ba Revert "#71: Fixing statefulness of LpProblem to allow pickling and unpickling."
This reverts commit fdb518b76a.
2015-12-29 08:32:27 -05:00
Ryan J. O'Neil 4448335671 Changing dict construction syntax to work with Python 2.6 2015-12-29 08:15:11 -05:00
Ryan J. O'Neil 07a2ea11af Fixing issue with file names that have spaces, and issue with SCIP not writing 0-valued variables to .sol file. 2015-12-29 08:08:58 -05:00
Ryan J. O'Neil ccf7c9c95c Adding interface to the SCIP solver 2015-12-29 07:33:09 -05:00
Ryan J. O'Neil fdb518b76a #71: Fixing statefulness of LpProblem to allow pickling and unpickling. 2015-12-29 06:13:29 -05:00
Ryan J. O'Neil 46086ea084 #85: pulp.LpProblem issues a warning on implicit overwrite of previously set objective function. 2015-12-29 05:31:34 -05:00
Stuart Mitchell ebda1cd469 Auto build of docs fix 2015-12-25 15:29:28 +09:00
Stuart Mitchell 2e75bf0e50 Merge branch 'release/1.6.1' 2015-12-25 15:12:52 +09:00
Stuart Mitchell 1cf6544afd version bump 2015-12-25 15:12:31 +09:00
Stuart Mitchell 91ebb28000 Documentation fix Fixes #91 2015-12-25 14:57:04 +09:00
Stuart Mitchell b62011cd75 Fixes #95 2015-12-25 14:30:53 +09:00
Jelmer Borst 2e3105a28f Fixed allcombinations() docstr 2015-10-31 13:31:14 +01:00
Stuart Mitchell ccabe8a2cd documentation building hopefully travis will do it now 2015-06-10 00:16:00 +12:00
Stuart Mitchell f524387728 travis auto deploy to pypi 2015-06-09 23:05:47 +12:00
Stuart Mitchell 5de0fe3034 Merge tag '1.6.0' into develop
Minor patch but we ran out of version numbers

* cplex fixes
2015-06-09 22:33:28 +12:00