Issue 133 doidatasets primary key #136
Merged
Conversation
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
… a proper primary key. updating the psycopg2 package in requirements to reflect its new naming (psycopg2-binary) Fixes pacifica#133
…3-doidatasets_primary_key * commit 'cd3f2627700bf2f21eee75acd1c6f57816d2fd4b': fix pacifica#133 doidataset primary key (pacifica#135)
dmlb2000
requested changes
May 4, 2018
metadata/rest/test/test_orm.py
Outdated
| @@ -126,7 +126,7 @@ def test_perf_of_large_insert(self): | |||
| data=txt_trans, headers=self.headers) | |||
| self.assertEqual(req.status_code, 200) | |||
| end_time = time() | |||
| self.assertTrue(end_time - start_time < 90) | |||
There was a problem hiding this comment.
This should be reverted... or we should document justification for changing it
There was a problem hiding this comment.
Rolling this one back. This test was failing multiple times, but I think it was just Travis misbehaving.
requirements-dev.txt
Outdated
| @@ -7,7 +7,7 @@ mock | |||
| nose | |||
| peewee>2 | |||
| pep257 | |||
| psycopg2 | |||
There was a problem hiding this comment.
I don't think this is needed, why is this different from the normal package?
There was a problem hiding this comment.
They are renaming the package from psycopg2 to psycopg2-binary and deprecating the old name.
There was a problem hiding this comment.
psycopg/psycopg2#674 this bug has links to the discussion and plan moving forward. The package specified is going to be a source only build. Which is fine for travis.
requirements.txt
Outdated
| @@ -1,7 +1,7 @@ | |||
| cherrypy | |||
| elasticsearch | |||
| peewee>2 | |||
| psycopg2 | |||
dmlb2000
approved these changes
May 4, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
[Describe what this change achieves]
Issues Resolved
[List any existing issues this PR resolves]
Check List