Skip to content
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.

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

Numerous updates #56

Merged
merged 6 commits into from
Nov 7, 2017
Merged

Numerous updates #56

merged 6 commits into from
Nov 7, 2017

Conversation

greglandrum
Copy link
Member

Some of the changes here:

  • Use rdkit master instead of a particular release. We should be sure to change this before merging to master
  • Switch the linux and mac builds to boost 1.63
  • Pin the conda version in an attempt to avoid their new builds

I've tested the full thing on the Mac and on CentOS6 with py36 (py35 seems to always be the same) and py27.
Most of this has also been tested on windows, but I will confirm that again.

I have not updated the other pieces, the cartridge build in particular, but that should also be done.

@greglandrum greglandrum requested a review from rvianello October 3, 2017 17:25
Copy link
Contributor

@rvianello rvianello left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the changes look good to me, I'll send you a message about the cartridge recipes, partly related to the status of the other pending PR.

RDBASE=$SRC_DIR LD_LIBRARY_PATH="$PREFIX/lib:$SRC_DIR/lib" PYTHONPATH=$SRC_DIR ctest -j$CPU_COUNT --output-on-failure
RDBASE=$SRC_DIR LD_LIBRARY_PATH="$PREFIX/lib:$SRC_DIR/lib" PYTHONPATH=$SRC_DIR $PYTHON "$RECIPE_DIR/pkg_version.py"
else
make -j$CPU_COUNT install
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this 'make install' in the osx branch looks a bit odd to me, I guess there's probably a reason for introducing it, but I'll comment anyway, just in case it's an oversight.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I put that in there when I was in the flailing "why the hell doesn't this work?" stage caused by the new conda python builds.
I'll try taking it out to see if things still work without it.

@greglandrum
Copy link
Member Author

@rvianello : I think this is now mergeable as is.
I've tested the rdkit-postgresql95 recipe on the mac and it looks fine. Do we still need to support building older versions?

Once this is merged onto development, I think we should consider pushing it to master as well.

@rvianello
Copy link
Contributor

@greglandrum thanks for the updates, and sorry for the slow feedback. the rdkit-postgresql95 recipe worked fine with the upstream 'postgresql' in my tests too, and I also agree that there should be little need for building the cartridge for the older versions (once the master is updated we could maybe consider removing some of these recipes that are no longer useful).

@greglandrum greglandrum merged commit 7e80fec into development Nov 7, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants