Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

Fix #643: Version Errors With Centos6 #645

Merged
merged 9 commits into from Jan 4, 2018

Conversation

tst-jblair
Copy link
Collaborator

@tst-jblair tst-jblair commented Dec 31, 2017

Python 2.6 doesn't have the same API for Python's subprocess functionality; switch to using the more appropriate and flexible GitPython module instead.

WIP: This change requires GitPython to be added to the installed dependencies.

WIP: If anyone has any ideas for how to immediately get to the root of the git repository tree (required by git.Repo()), I would like a cleaner method for that than "search all parents of the current directory." But, this should just be a minor cleanliness note.

Test Procedure:

  • Build with Centos 6 and 7
  • Examine src/NATIVE*/gee_long_version.txt, and check that it has an "alpha" entry, or similar.

Centos 6: Checking that the fix works with Python 2.6.
Centos 7: Checking that the fix works with Python 2.7 (which uses a different version of GitPython, which in turn changes the default setting of an important parameter).

Copy link
Collaborator

@tst-dsugar tst-dsugar left a comment

Choose a reason for hiding this comment

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

This is rather clear and clean. We are basically replacing invoking git externally through execs with git python, and it is only used in a few places.

@googlebot
Copy link

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this State. It's up to you to confirm consent of the commit author(s) and merge this pull request when appropriate.

- sudo apt-get install -qq libperl4-corelibs-perl libtool xorg-dev doxygen python-dev alien swig libgtest-dev libstdc++6 libxml2-dev gettext libxinerama-dev libxft-dev libxrandr-dev libxcursor-dev libgdbm-dev libc6 libc6-dev libmng-dev zlib1g-dev libcap-dev libpng12-0 libpng12-dev freeglut3-dev flex libx11-dev bison++ bisonc++ libjpeg-dev libjpeg8-dev python2.7 python2.7-dev python2.7-psycopg2 libogdi3.2-dev libgif-dev libxerces-c-dev libgeos-dev libgeos++-dev libfreetype6 libfreetype6-dev python-imaging libproj-dev python-setuptools libgif-dev libxerces-c-dev libcap-dev libpq-dev openssl libxml2-utils libxmu-dev

- sudo apt-get install -qq libperl4-corelibs-perl libtool xorg-dev doxygen python-dev alien swig libgtest-dev libstdc++6 libxml2-dev gettext libxinerama-dev libxft-dev libxrandr-dev libxcursor-dev libgdbm-dev libc6 libc6-dev libmng-dev zlib1g-dev libcap-dev libpng12-0 libpng12-dev freeglut3-dev flex libx11-dev bison++ bisonc++ libjpeg-dev libjpeg8-dev python2.7 python2.7-dev python2.7-psycopg2 libogdi3.2-dev libgif-dev libxerces-c-dev libgeos-dev libgeos++-dev libfreetype6 libfreetype6-dev python-imaging libproj-dev python-setuptools libgif-dev libxerces-c-dev libcap-dev libpq-dev openssl libxml2-utils libxmu-dev python-pip
- sudo pip install gitpython
Copy link
Collaborator

Choose a reason for hiding this comment

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

This has me a bit worried. I've seen some problems with pip in the past, but maybe that was isolated to Apache modules

Copy link
Collaborator

Choose a reason for hiding this comment

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

In general, if there is a suitable OS Package alternative, then that would be better to use. However, looks like you only use pip for travis ci, so that's probably OK.

@tst-jblair tst-jblair changed the title (WIP) Fix #643: Version Errors With Centos6 Fix #643: Version Errors With Centos6 Jan 2, 2018
Copy link
Collaborator

@tst-ccamp tst-ccamp left a comment

Choose a reason for hiding this comment

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

The pip install is just for Travis, so I'm good with the changes

@tst-jcupp tst-jcupp merged commit bc9c1a5 into google:master Jan 4, 2018
husf-dsheremata added a commit to husf-dsheremata/earthenterprise that referenced this pull request Jan 6, 2018
Also added xerces-c, ogdi and geos RPM dependencies as they are not always automatically picked up as requirements in the build on all EL6/7 platforms.
tst-lsavoie pushed a commit that referenced this pull request Jan 8, 2018
…pendencies in rpms (#655)

* Added proj rpm dependency to opengee-fusion rpm

* #645 - added proj-devel dependency to fix fusion runtime errors.
Also added xerces-c, ogdi and geos RPM dependencies as they are not always automatically picked up as requirements in the build on all EL6/7 platforms.

* Rearranged rpm dependencies to eliminate circular dependency of opengee-postgist<-->opengee-common rpms.  Now opengee-postgis rpm depends on common, and opengee-server and opengee-fusion both explicitly depend on opengee-fusion and opengee-common.

* Updated docs with more specific requirements and steps for building and testing RPMs installations.
* Removed extraneous dependencies per PR comments, after further testing.

* Removed opengee-fusion rpm dependency on opengee-postgis

* Added comment explaining why chkconfig is required as an explicit requirement for opengee-common rpm.

* Updated version constraint on postgis to support PR #641
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants