This repository has been archived by the owner on Dec 7, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 170
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adds pymongo 2.7.2 and mongoengine 0.9.0
The pymongo spec file skips tests that require a running instance of mongodb. I manually ran the tests against a running instance once and they all passed for me. If we ever configure the builder with a running instance of mongodb we can delete the --exclude list in the pymongo spec file. Updates pulp.server.db.manage:ensure_database_indexes() to only use the Document.ensure_indexes() method. Removes pulp.server.db.model.queryset:update_one() which was here for 0.7.10 compatability. This also updates all tests to run correctly when the test runner has mongoengine==0.9.0 and pymongo==2.7.2 installed. Test server.managers.repo.test_cud:test_update_repo_and_plugins is removed altogether. I don't know why it was failing after upgrading the deps, but when I downgrade the deps back to mongoengine 0.7.10 and pymongo 2.5.3 it passed. It's safe to remove altogether here because it has completely been removed and rewritten with #1931. https://pulp.plan.io/issues/934 fixes #934
- Loading branch information
Brian Bouterse
committed
Jun 26, 2015
1 parent
cf67ab5
commit 333e73c
Showing
24 changed files
with
440 additions
and
254 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,14 @@ | ||
Team owner: cduryee | ||
Team owner: bmbouter | ||
|
||
This is the same as the EPEL6 srpm. It is included here for building for el7, since EPEL7 does not carry python-mongoengine. | ||
Pulp uses a vanilla version of mongoengine 0.9.0, except for one | ||
patch which removes Pillow as a setuptools dependency. Not | ||
having Pillow installed at runtime will disable the ImageField, | ||
but mongoengine will operate fully otherwise. At the time I built | ||
mongoengine 0.9.0, Pillow is not available on EL6. | ||
|
||
python-mongoengine requires at least pymongo 2.7.1 at runtime. | ||
|
||
The spec file was originally adapted from the spec file inside of | ||
python-mongoengine-0.8.4-3.el7.src.rpm [0]. | ||
|
||
[0]: http://koji.fedoraproject.org/koji/buildinfo?buildID=612617 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
el7 | ||
el6 el7 fc21 fc22 |
11 changes: 0 additions & 11 deletions
11
deps/python-mongoengine/fix-requirements-pillow-instead-PIL.patch
This file was deleted.
Oops, something went wrong.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
deps/python-mongoengine/remove-Pillow-as-test-requirement.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
From 34ad568af4843c3baf5018e992afc1214118eb37 Mon Sep 17 00:00:00 2001 | ||
From: Brian Bouterse <bmbouter@gmail.com> | ||
Date: Thu, 18 Jun 2015 16:15:20 -0400 | ||
Subject: [PATCH] Removing Pillow from list of tests_require in setup.py | ||
|
||
--- | ||
setup.py | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/setup.py b/setup.py | ||
index 8851978..2c39e7f 100644 | ||
--- a/setup.py | ||
+++ b/setup.py | ||
@@ -58,7 +58,7 @@ if sys.version_info[0] == 3: | ||
extra_opts['packages'] = find_packages() | ||
extra_opts['package_data'] = {"tests": ["fields/mongoengine.png", "fields/mongodb_leaf.png"]} | ||
else: | ||
- extra_opts['tests_require'] = ['nose', 'coverage', 'blinker', 'django>=1.4.2', 'Pillow>=2.0.0', 'jinja2>=2.6', 'python-dateutil'] | ||
+ extra_opts['tests_require'] = ['nose', 'coverage', 'blinker', 'django>=1.4.2', 'jinja2>=2.6', 'python-dateutil'] | ||
|
||
if sys.version_info[0] == 2 and sys.version_info[1] == 6: | ||
extra_opts['tests_require'].append('unittest2') | ||
-- | ||
1.9.3 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
Team owner: bmbouter | ||
|
||
Pulp currently uses a vanilla version of pymongo 2.7.2. That is | ||
the latest Z release for the pymongo 2.7 release stream. | ||
|
||
python-mongoengine requires at least pymongo 2.7.1 at runtime. | ||
|
||
The spec file was originally adapted from the spec file inside of | ||
python-pymongo-2.5.2-7.fc23.src.rpm [0]. Thanks also to dgoodwin | ||
and Dominic in #tito for the spec file help. | ||
|
||
[0]: http://koji.fedoraproject.org/koji/buildinfo?buildID=659860 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
el6 el7 fc21 fc22 |
Binary file not shown.
Oops, something went wrong.