On Sun, Jan 13, 2013 at 05:52:38PM +0000, John Keeping wrote:
> On Sun, Jan 13, 2013 at 12:14:02PM -0500, Pete Wyckoff wrote:
>> j...@keeping.me.uk wrote on Sun, 13 Jan 2013 16:26 +0000:
>>> On Sat, Jan 12, 2013 at 06:30:44PM -0500, Pete Wyckoff wrote:
>>> > j...@keeping.me.uk wrote on Sat, 12 Jan 2013 19:23 +0000:
>>> >> When different version of python are used to build via distutils, the
>>> >> behaviour can change. Detect changes in version and pass --force in
>>> >> this case.
>>> >[..]
>>> >> diff --git a/git_remote_helpers/Makefile b/git_remote_helpers/Makefile
>>> >[..]
>>> >> +py_version=$(shell $(PYTHON_PATH) -c \
>>> >> + 'import sys; print("%i.%i" % sys.version_info[:2])')
>>> >> +
>>> >> all: $(pysetupfile)
>>> >> - $(QUIET)$(PYTHON_PATH) $(pysetupfile) $(QUIETSETUP) build
>>> >> + $(QUIET)test "$$(cat GIT-PYTHON_VERSION 2>/dev/null)" =
>>> >> "$(py_version)" || \
>>> >> + flags=--force; \
>>> >> + $(PYTHON_PATH) $(pysetupfile) $(QUIETSETUP) build $$flags
>>> >> + $(QUIET)echo "$(py_version)" >GIT-PYTHON_VERSION
>>> >
>>> > Can you depend on ../GIT-PYTHON-VARS instead? It comes from
>>> > 96a4647 (Makefile: detect when PYTHON_PATH changes, 2012-12-18).
>>> > It doesn't check version, just path, but hopefully that's good
>>> > enough. I'm imagining a rule that would do "clean" if
>>> > ../GIT-PYTHON-VARS changed, then build without --force.
>>>
>>> I was trying to keep the git_remote_helpers directory self contained. I
>>> can't see how to depend on ../GIT-PYTHON-VARS in a way that is as simple
>>> as this and keeps "make -C git_remote_helpers" working in a clean tree.
>>>
>>> Am I missing something obvious here?
>>
>> Not if it wants to stay self-contained; you're right.
>>
>> I'm not thrilled with how git_remote_helpers/Makefile always
>> runs setup.py, and always generates PYLIBDIR, and now always
>> invokes python a third time to see if its version changed.
>
> I don't think PYLIBDIR will be calculated unless it's used ('=' not
> ':=' means its a deferred variable).
>
> I wonder if the version check should move into setup.py - it would be
> just as easy to check the file there and massage sys.args, although
> possibly not as neat.
For reference, putting the version check in setup.py looks like this:
-- >8 --
diff --git a/git_remote_helpers/setup.py b/git_remote_helpers/setup.py
index 6de41de..2c21eb5 100644
--- a/git_remote_helpers/setup.py
+++ b/git_remote_helpers/setup.py
@@ -3,6 +3,7 @@
"""Distutils build/install script for the git_remote_helpers package."""
from distutils.core import setup
+import sys
# If building under Python3 we need to run 2to3 on the code, do this by
# trying to import distutils' 2to3 builder, which is only available in
@@ -13,6 +14,24 @@ except ImportError:
# 2.x
from distutils.command.build_py import build_py
+
+current_version = '%d.%d' % sys.version_info[:2]
+try:
+ f = open('GIT-PYTHON_VERSION', 'r')
+ latest_version = f.read().strip()
+ f.close()
+
+ if latest_version != current_version:
+ if not '--force' in sys.argv:
+ sys.argv.insert(0, '--force')
+except IOError:
+ pass
+
+f = open('GIT-PYTHON_VERSION', 'w')
+f.write(current_version)
+f.close()
+
+
setup(
name = 'git_remote_helpers',
version = '0.1.0',
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
