Summary

Support building media with parallel-installed Django

Review Request #5689 — Created April 9, 2014 and submitted May 2, 2014, 3:10 p.m.

Information

Owner

sgallagh

Repository

Djblets

Branch

release-0.7.x

Bugs

Depends On

Blocks

5690

Commit

5c98059...

Reviewers

Groups

djblets

People

Description

On systems such as Fedora where older versions of Django are
installed as alternative versions (and not directly importable),
we need to ensure that we are importing exactly the right version
of the Django modules.

This patch adds a new variable in the djblets __init__.py that is
imported by both setup.py and build-media.py to ensure that they
are both relying on the same version of Django.

This doesn't get handled automatically by setuptools because this
script is invoked directly via sys.executable() in BuildMedia().

Testing Done

Successfully built Djblets for Fedora

Issues

Description	From	Last Updated
Same comment as on the reviewboard change, I'd rather see this in djblets/__init__.py	david	May 2, 2014, 7:12 a.m.
Once the django version is in __init__.py (and you're adding to this line), could you move this import back up …	david	May 2, 2014, 7:12 a.m.

Can you put the dependency info in some central place (such as djblets/__init__.py) and import it from both here and setup.py? I really don't want to introduce multiple places that we have to remember to change when we bump versions.

Change Summary:

Addresses the earlier review comment and stores the version in a single place

Summary:

-	Support building with parallel-installed Django
+	Support building media with parallel-installed Django

Description:

		On systems such as Fedora where older versions of Django are
		installed as alternative versions (and not directly importable),
		we need to ensure that we are importing exactly the right version
		of the Django modules.

~		This doesn't get handled automatically by setuptools because this script is invoked directly via sys.executable() in BuildMedia().
	~	This patch adds a new shared dependencies.py file in the root path
	+	that is imported by both setup.py and build-media.py to ensure that
	+	they are both relying on the same version of Django.

~		Note: it's safe to use the generic >1.4,<1.5 approach here because setuptools for the rest of the build has already guaranteed the minor 1.4 version.
	~	This doesn't get handled automatically by setuptools because this
	+	script is invoked directly via sys.executable() in BuildMedia().

Commit:

-	8596f893d379c2c9819e37d9f67a478681219671
+	cc6290e47af5a69ed55eff0bcf459381e36d728a

Diff:

Revision 2 (+24 -4)

Show changes

	dependencies.py
	setup.py
	contrib/internal/build-media.py

dependencies.py (Diff revision 2)

The issue has been resolved. Show all issues

Same comment as on the reviewboard change, I'd rather see this in djblets/__init__.py

setup.py (Diff revision 2)

The issue has been resolved. Show all issues

Once the django version is in __init__.py (and you're adding to this line), could you move this import back up to be next to the other imports?

Change Summary:

Moved the version to init.py and dropped the dependencies.py file.

Description:

		On systems such as Fedora where older versions of Django are
		installed as alternative versions (and not directly importable),
		we need to ensure that we are importing exactly the right version
		of the Django modules.

~		This patch adds a new shared dependencies.py file in the root path
~		that is imported by both setup.py and build-media.py to ensure that
~		they are both relying on the same version of Django.
	~	This patch adds a new variable in the djblets __init__.py that is
	~	imported by both setup.py and build-media.py to ensure that they
	~	are both relying on the same version of Django.

		This doesn't get handled automatically by setuptools because this
		script is invoked directly via sys.executable() in BuildMedia().

Commit:

-	cc6290e47af5a69ed55eff0bcf459381e36d728a
+	5c98059dd5111fa6bab3e03fc55b265c36dea7ba

Diff:

Revision 3 (+16 -7)

Show changes

	setup.py
	contrib/internal/build-media.py
	djblets/__init__.py

Ship it!

```
Ship It!
```

Status: Closed (submitted)

Change Summary:

Pushed to release-0.7.x (8508d95)