Summary

Support building media with parallel-installed Django

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

Information

Owner

sgallagh

Repository

Review Board

Branch

release-1.7.x

Bugs

Depends On

~~5689~~

Commit

0d810c9...

Reviewers

Groups

reviewboard

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 reviewboard __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.

Testing Done

Built successfully on Fedora.

Issues

Description	From	Last Updated
Can you put the dependency info in some central place (such as reviewboard/__init__.py) and import it from both here and …	david	May 1, 2014, 5:53 a.m.
Instead of adding a new top-level file just for this, I think I'd rather it be another entry in reviewboard/__init__.py	david	May 2, 2014, 7:17 a.m.

contrib/internal/build-media.py (Diff revision 1)

Show all issues

Can you put the dependency info in some central place (such as reviewboard/__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:

-	a4bb4ff84f4d24f5dea0b700573d07158440874e
+	391756bb83f614aa4d31851bfaadcab1c79585eb

Diff:

Revision 2 (+27 -5)

Show changes

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

dependencies.py (Diff revision 2)

Show all issues

Instead of adding a new top-level file just for this, I think I'd rather it be another entry in reviewboard/__init__.py

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 reviewboard __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:

-	391756bb83f614aa4d31851bfaadcab1c79585eb
+	0d810c9e861f4666d668c0e75de76c60506afd52

Diff:

Revision 3 (+18 -6)

Show changes

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

Ship it!

```
Ship It!
```

Status: Closed (submitted)

Change Summary:

Pushed to release-1.7.x (27df042)