Skip to content

sync 'development' branch with 'master' and update for 2016.09.3 #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 57 commits into from
Jan 3, 2017
Merged

sync 'development' branch with 'master' and update for 2016.09.3 #43

merged 57 commits into from
Jan 3, 2017

Conversation

rvianello
Copy link
Contributor

  • aligns the development branch with the recent changes from the master branch (e.g. cairo support)
  • switches the build for the postgresql cartridge to use cmake instead of make
  • modifies the Dockerfile to COPY the recipes from the context instead of cloning the conda-rdkit repo (this way ensuring that the recipes from the same branch/snapshot are built)
  • updates the RDKit rev tag to 2016.09.3

I tested the recipes and the Dockerfile on my fedora box.

rvianello and others added 30 commits May 2, 2015 19:30
@rvianello
increase the build number to reflect the updated configuration
47430c2
@rvianello
updated release tag
9aef4dd
@rvianello
use the recipes from the master branch
df39b46
@rvianello
do not generate the release build number from the current date
32fad01
@rvianello
adding RDConfig patch fixing a win-specific issue
435c642
@greglandrum
Switch the Mac build command to use DYLD_FALLBACK_LIBRARY_PATH instea…
3150989 
…d of DYLD_LIBRARY_PATH
@rvianello
make dependency from python explicit
b17870c
@rvianello
Merge changes for Release_2015_09_2 from branch 'development'
aeef03c
@rvianello
fixed missing source settings for [win and py34]
75f5f41
@rvianello
added missing boost dependency for [win and py34]
a39f653
@greglandrum
Get the boost build working with py35
ee7d6fe 
A better shell programmer than me could no doubt generalize this.
@rvianello
Merge pull request #9 from rdkit/greglandrum-py35boost-build
f6064b7 
Get the boost build working with py35
@greglandrum @rvianello
switch to ctest instead of 'make test'
56c3a77 
A fix to help with builds on the Mac (there was an environment and shared library problem on El Capitan)
also runs tests in parallel

Given that ctest is part of cmake, which is required, this shouldn't be a problem anywhere.
@greglandrum
explicit avalon and inchi pulls no longer required
e5c14cb
@greglandrum
bump to next release
b05fb7f
@rvianello
Merge pull request #16 from greglandrum/master
ff7448b 
explicit avalon and inchi pulls no longer required; bump version
@rvianello
Merge updates from branch 'development'
4399b3f
@rvianello
build the tagged release
10f5e09
@rvianello
increased the build number
155a74f
@greglandrum
Merge pull request #19 from rvianello/dev/rel-2016.03
1a26dc2 
update of the master branch for rel 2016.03.1
@greglandrum
switch to the 2016_03_2 release
a25fc8c
@rvianello
Merge branch 'dev/improve-Dockerfile'
1601fb2
@rvianello
update the git release tag to Release_2016_03_2
3bdea27
@rvianello
Merge additional improvements from branch 'dev/improve-Dockerfile'
f1a430e
@greglandrum
Merge pull request #21 from rvianello/master
0c1468d 
fix the rdkit-postgresql* recipes for Release_2016_03_2
@greglandrum
update to 2016.03.3
1caaf8a
@rvianello
Merge pull request #23 from greglandrum/update_for_new_release
fd41883 
update to 2016.03.3
@rvianello
update to Release_2016_03_4
22f8bee
@greglandrum
Merge pull request #25 from rvianello/update-to-Release_2016_03_4
80c6334 
update to Release_2016_03_4
@rvianello
fix issue #27
146c2c6
greglandrum and others added 26 commits November 12, 2016 05:36
@greglandrum
update to new release
eaa0bd4
@rvianello
Fix postgres patch for 2016.09.1 (#31)
ac4ba9f 
* updated patch file

* fix issue #27

* link the missing rdkit libraries
@rvianello
Merge pull request #30 from greglandrum/master
6c6fa0a 
update to new release
@rvianello
comply with the formatting applied by #1078
11c4d82
@rvianello
update the cartridge Makefile patch
49c4c4f
@rvianello
update the release tag
1f0230c
@greglandrum
Merge pull request #33 from rvianello/update_to_2016_09_2
1ea88c8 
Update to 2016 09 2
@greglandrum
add --output-on-failure to ctest flags
9b86613
@rvianello
Merge pull request #34 from rdkit/greglandrum-patch-3
83d0622 
add --output-on-failure to ctest flags
@greglandrum
add first pass
96c59f1
@greglandrum
update rdkit depends for first pass
a9f72e8
@greglandrum
build cairo
1ccb35f
@greglandrum
add nox as a feature
98446da
@greglandrum
works on the mac
5b34db6
@greglandrum
update Dockerfile, still needs testing
ea5e768
add a local eigen build too
13b8c9f
@greglandrum
add eigen
9a429ff
@rvianello
Merge pull request #35 from greglandrum/add_own_cairo
8aee1ff 
Add own cairo (+ eigen3 support)
@rvianello
relocate the conda build directory to fix the postgresql build.
0976824
@greglandrum
Merge pull request #36 from rvianello/fix/Dockerfile-postgresql-build
2ca2b67 
relocate the conda build directory to fix the postgresql build.
@rvianello
use cmake to build the postgresql cartridge
0fa05fd
@rvianello
Resync with master branch
2de8a5a
@rvianello
update the release tag
775321a
@rvianello
update release label
3c527c9
@rvianello
use cmake to build the rdkit postgresql cartridge
8de1262
@rvianello
COPY the recipes instead of cloning the git repo
483c45d
@rvianello rvianello mentioned this pull request Dec 30, 2016
Closed
@greglandrum greglandrum merged commit e27b2d2 into rdkit:development Jan 3, 2017
@markussitzmann markussitzmann mentioned this pull request May 14, 2017
Open
@rvianello rvianello deleted the dev/Release-2016.09.3 branch July 19, 2017 20:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@rvianello @greglandrum