Commit Graph

45 Commits

Author SHA1 Message Date
Greg Landrum
6a36c87961 Update to use the travis Xenial environment (#2200)
* unlikely to work

* try using system boost

also disable mac builds for the moment

* yeah, can't use system boost; use conda instead

* typo

* switch to boost 1.67.0

1.65.1 causes failures with testEnumeration on linux

* oops

* re-enable mac builds
2018-12-25 21:58:52 -05:00
Greg Landrum
213b776251 Stop building against python2 in travis (#2134)
* remove python2 from travis

* more python2 removal
2018-11-03 04:55:23 +01:00
Greg Landrum
6c54135da1 mac adaptations (#2071) 2018-09-28 11:23:13 +02:00
Greg Landrum
6d9c8b9514 re-enable python wrappers 2018-09-28 07:36:31 +02:00
Dan N
eaa44b40c2 Enhanced stereo read/write support in SDF files. (#2022)
* add a couple test files

* backup

* first pass at some theory documentatin

* it's a draft

* Update enhanced stereochemistry documentation

Adds initial target use case and caveats about the tentative
nature of the current implementation.

* Support read/write of molfile enhanced stereochemistry

This includes reading and writing of enhanced stereochemistry
from v3000 molfiles (sdf). Enhanced stereochemistry encodes
the relative configuration of stereocenters, allowing
representation of racemic mixtures and compounds with
unknown absolute stereochemistry.

It does not include:
* Python wrapping
* invalidation of the enhanced stereochemistry
* use of enhanced stereochemistry in search
* depiction of enhanced stereochemistry.

* Update to reflect changes from #1971

* change names of enum elements to allow compilation in VS2017

I think it's also clearer to do things this way

* Addressed most review comments.

* Run missed test "testEnhancedStereoChemistry"
* In tests, added size checks to group equality checks
* Updated copyright statements
* Deleted mol created for a test
* Use perfect forwarding in RWMol::setStereoGroups()
* use references for stereo groups that are checked in write and pickle
* Updated stereogroup.h in hopes of fixing compilation on Windows.
* clang-format

* try allowing a switch to boost regex and requiring it for g++-4.8

* do a better job of that

* typo

* Code review comments. Updated Copyright notice.

* When an atom is deleted, delete stereo groups containing it.

Also updates StereoGroup toUse accessors instead of
constant member attributes. This allows move of StereoGroups.

* RDKit style guide

* Add header required on Windows.

* get the SWIG wrappers to build
2018-09-26 15:44:23 +02:00
Greg Landrum
2190c991f0 if this doesn't work I will switch to a branch
(the reason the current version doesn't work: the anaconda-supplied boost packages need to be used with the anaconda-supplied compilers)
2018-05-13 10:56:37 +02:00
Greg Landrum
7a7c0c292a get the *correct* boost 2018-05-13 07:43:14 +02:00
Greg Landrum
214669ac06 Switch travis config to use boost 1.65.1 on linux 2018-05-13 05:47:23 +02:00
Brian Kelley
10496f750f Adds build matrix, make c++11 default in cmake (#1822) 2018-04-15 17:25:34 +02:00
Greg Landrum
87786c08b5 Merge branch 'master' into modern_cxx
# Conflicts:
#	.travis.yml
#	Code/GraphMol/FileParsers/MolFileParser.cpp
#	Code/GraphMol/FileParsers/MolFileStereochem.cpp
#	Code/GraphMol/ForceFieldHelpers/UFF/testUFFHelpers.cpp
#	Code/GraphMol/MolAlign/testMolAlign.cpp
#	Code/GraphMol/MolDraw2D/MolDraw2D.cpp
#	Code/GraphMol/MolDraw2D/Wrap/rdMolDraw2D.cpp
#	Code/GraphMol/QueryOps.cpp
#	Code/GraphMol/ROMol.cpp
#	Code/GraphMol/SmilesParse/test.cpp
#	Code/GraphMol/Trajectory/Trajectory.cpp
#	Code/GraphMol/Wrap/Atom.cpp
#	Code/GraphMol/Wrap/Bond.cpp
#	Code/GraphMol/new_canon.cpp
#	Code/RDGeneral/testDict.cpp
#	Code/SimDivPickers/Wrap/MaxMinPicker.cpp
2017-10-05 05:58:38 +02:00
Brian Kelley
210935a92c Adds FreeSASA adapter (#1565)
* Adds FreeSASA adapter

* Uses windows branch when necessary

* Oops inverted windows and unix builds

* Fixes windows source build

* Adds downloading message

* Updates FreeSASA to final API

* Adds python API

* Finished queryatom API

* Changes d_alg to algorithm (and d_classifier) exposes to python adds docs/tests

* Adds FATAL_ERROR to MSVC builds, removes from appveyor
2017-09-25 08:57:14 +02:00
Alain Vaucher
7795a425ff Further cmake improvements (#1515)
* New syntax to import Qt5 dependency in MolDraw2D

* In QTDemo, not necessary to import Qt explicitly because it is automatically imported through target MolDraw2D

* improve import of Cairo dependency

* Remove explicit linking of Cairo in C++ examples

* Use imported targets for Boost

* Using imported CMake targets for Eigen

* Use imported targets for Threads

* Simplify sample CMakeLists

* Remove duplication

* a couple small changes for travis

* typo

* update toolchain to trusty

* switch to requiring at least boost 1.56

* typo

* update boost dependency to pull in the build that has more libraries

* meaningless commit to trigger travis

* switch to ust libc++

* install libc++

* check abi

* try the other one; disable py27 for the moment to speed things up

* switch to c++11, that seems necessary with the conda boost builds at the moment

* re-enable python2.7
2017-08-07 15:49:08 +02:00
Greg Landrum
a9ca49920b Fixes #1507 (#1514)
* Fixes #1507

* a couple small changes for travis

* typo
2017-08-03 07:51:47 -04:00
Greg Landrum
67ae2cdae1 temporarily disable python wrappers 2017-07-03 06:35:46 +02:00
Greg Landrum
e0c3fa63ba temporarily switch off the swig builds again 2017-07-03 05:14:00 +02:00
Greg Landrum
0bb5e14ebf Some cleanups to make Travis builds faster (#1464)
* a bit of cleanup and modernization

* switch to -j3

* back to -j2

* disable static libs

* allow dynamic linking of swig wrappers

* turn off the py27 builds while we are testing

* Install java and SWIG

* re-enable python2.7
2017-07-02 11:27:40 +02:00
Greg Landrum
66779dfc8d Some cleanups to make Travis builds faster (#1464)
* a bit of cleanup and modernization

* switch to -j3

* back to -j2

* disable static libs

* allow dynamic linking of swig wrappers

* turn off the py27 builds while we are testing

* Install java and SWIG

* re-enable python2.7
2017-06-18 21:55:24 -04:00
Greg Landrum
c1d8fbd1dc update travis 2017-04-22 17:21:53 +02:00
Greg Landrum
4f2ec84e7b Add some 3D molecular descriptors (#1084)
* update .gitignore

* foundation for 3D descriptors
move PBF into core

* cleanup work

* a bit more cleanup

* move the principal moments calc to MolTransforms

* cleanup

* cleanups

* add caching of the principal moments and values

* do not include the 3D descriptors in MolDescriptors.h

* the properties are computed

* add PMI descriptors and tests

* add tests for NPR descriptors

* return 0 when the largest PMI is zero

* PMI edge case tests

* NPR edge case tests

* PBF edge case tests

* PBF edge case tests

* more edge cases

* add a few more 3d descriptors

* add defns to docs

* tests for the new descriptors

* add versions to new descriptors

* add 3d descriptors to python wrapper

* add eigen support to the travis build

* try to get non-windows builds working

* remove computeCovarianceMatrix() from java wrapper

* make pmi property names "private"
2016-10-10 08:34:08 -04:00
Greg Landrum
76a338c1be Fixes #859 - add automatic downloads of the junit.jar code too
* download junit.jar automatically when it is needed

* do not need to download junit anymore

* doc update

* try a different maven url to see if that solves the MD5 problems
2016-04-13 09:54:03 -04:00
Greg Landrum
999d0aa99c adjust travis scripts now that we no longer have to explicitly download the avalon and InChI code 2016-03-30 10:31:35 +02:00
Greg Landrum
bcbe917ec0 switch travis ctests to use two cores 2015-11-13 04:56:56 +01:00
Brian Kelley
9e6b811557 Enable thread testing on travis 2015-10-15 08:14:33 -04:00
Brian Kelley
7fe8fb5fb4 Another update to LD_LIBRARY_PATH during ctest invovation 2015-09-25 18:52:41 -04:00
Brian Kelley
c315b46dee Original LD_LIBRARY_PATH restored to the new one for travis test 2015-09-25 18:23:50 -04:00
Brian Kelley
12aabe6fd8 Adds LD_LIBRARY_PATH to ctest invocation 2015-09-25 17:55:19 -04:00
Greg Landrum
5781f28277 first pass at switching 2015-07-17 04:03:45 -04:00
Greg Landrum
554a673778 revert the curl change. The problem seems to be at sf.net 2015-07-17 04:03:18 -04:00
Greg Landrum
eaff4fc5a9 wget with sourceforge is failing from travis. Try curl instead 2015-07-17 03:50:47 -04:00
Greg Landrum
bfcf98672e add avalontools testing to the travis script 2014-11-21 17:36:25 +01:00
Riccardo Vianello
58d570f601 use boost 1.55 for travis-ci builds 2014-11-04 20:56:59 +01:00
Riccardo Vianello
95f60d21bc python3 portability fixes for pandas and the ipython notebook 2014-09-11 23:49:45 +02:00
Greg Landrum
dad92c50e1 that did not work at all; try again another day 2014-08-16 15:37:13 +02:00
Greg Landrum
418fcd0466 that was not particularly successful; add boost as well 2014-08-16 15:31:07 +02:00
Greg Landrum
fe03fb6459 try adding cartridge to the travis build 2014-08-16 14:58:05 +02:00
Riccardo Vianello
a0b78d0899 upgrade the py27 build to boost 1_55 + add java wrappers to py34 2014-08-11 21:02:02 +02:00
Riccardo Vianello
bfbc162fc0 use miniconda to build both python 2.7 and 3.4 bindings
include the java wrappers in the python 2.7 build
2014-08-02 21:51:53 +02:00
Greg Landrum
091368d242 remove the java tests since I cannot seem to make them work 2014-03-14 18:40:58 +01:00
Greg Landrum
0e88521759 more travis and java 2014-03-14 18:13:17 +01:00
Greg Landrum
895a11cffc add the java wrappers to the travis build part 5 2014-03-14 07:10:53 +01:00
Greg Landrum
76d50a2761 add the java wrappers to the travis build part 4 2014-03-14 05:55:37 +01:00
Greg Landrum
caa2439dcb add the java wrappers to the travis build part 3 2014-03-14 05:51:24 +01:00
Greg Landrum
20259f7a23 add the java wrappers to the travis build part 2 2014-03-14 05:47:33 +01:00
Greg Landrum
f55cb812da add the java wrappers to the travis build 2014-03-14 05:42:56 +01:00
Maciek Wójcikowski
6097ce56d2 Add Travis support 2014-02-26 13:53:06 +01:00