Adding branch description to Contributing #2256
Merged
Conversation
This file contains hidden or 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
August 23rd Release Candidate
[DO NOT MERGE] August 24th Release
|
👍 |
ElDeveloper
approved these changes
Aug 29, 2017
CONTRIBUTING.md
Outdated
| @@ -17,6 +17,14 @@ always take into consideration how these new features affect users and whether | |||
| or not adding a new section or document to the documentation (found under the | |||
| `doc` folder) would be useful. | |||
|
|
|||
| ###Repository branch structure | |||
There was a problem hiding this comment.
I just noticed that the ### is not being rendered as a title, see here. Seems to be a problem with a missing space between ### and the first letter in the title.
CONTRIBUTING.md
Outdated
|
|
||
| * `master`: This branch reflects the code deployed in our [main Qiita server](http://qiita.microbio.me). | ||
| * `dev`: This branch is the active development branch. All new Pull Requests should be performed against this branch. | ||
| * `release-candidate`: This branch is used to freeze the code from the `dev` branch, so we can deploy in our test servers and exercise the code extensively before deploying in our main system. |
There was a problem hiding this comment.
Do we want to make the test server URL public? Also, would it be worth noting the timeline?
There was a problem hiding this comment.
By timeline I mean how long each branch is alive for, when are freezes happening, etc.
|
I think our test server(s) need to remain internal. At the least not published.
Should be fire walled to only allow certain access.
As the test server code should only be slightly ahead of production, functionality should be fairly similar in most cases.
From: Yoshiki Vázquez Baeza <notifications@github.com<mailto:notifications@github.com>>
Reply-To: biocore/qiita <reply@reply.github.com<mailto:reply@reply.github.com>>
Date: Tuesday, August 29, 2017 at 8:02 AM
To: biocore/qiita <qiita@noreply.github.com<mailto:qiita@noreply.github.com>>
Cc: Subscribed <subscribed@noreply.github.com<mailto:subscribed@noreply.github.com>>
Subject: Re: [biocore/qiita] Adding branch description to Contributing (#2256)
@ElDeveloper approved this pull request.
________________________________
In CONTRIBUTING.md<#2256 (comment)>:
@@ -17,6 +17,14 @@ always take into consideration how these new features affect users and whether
or not adding a new section or document to the documentation (found under the
`doc` folder) would be useful.
+###Repository branch structure
I just noticed that the ### is not being rendered as a title, see here<https://github.com/josenavas/QiiTa/blob/73dca6fc78ca29a70725667ca916f7464618acd0/CONTRIBUTING.md>. Seems to be a problem with a missing space between ### and the first letter in the title.
________________________________
In CONTRIBUTING.md<#2256 (comment)>:
@@ -17,6 +17,14 @@ always take into consideration how these new features affect users and whether
or not adding a new section or document to the documentation (found under the
`doc` folder) would be useful.
+###Repository branch structure
+
+The Qiita repository contains three branches:
+
+* `master`: This branch reflects the code deployed in our [main Qiita server](http://qiita.microbio.me).
+* `dev`: This branch is the active development branch. All new Pull Requests should be performed against this branch.
+* `release-candidate`: This branch is used to freeze the code from the `dev` branch, so we can deploy in our test servers and exercise the code extensively before deploying in our main system.
Do we want to make the test server URL public? Also, would it be worth noting the timeline?
-
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub<#2256 (review)>, or mute the thread<https://github.com/notifications/unsubscribe-auth/ANq27aqmV1h0ngb4d8C1GXaI-TGzkW6Jks5sdCgCgaJpZM4PGEi6>.
|
Codecov Report
@@ Coverage Diff @@
## dev #2256 +/- ##
=======================================
Coverage 92.82% 92.82%
=======================================
Files 171 171
Lines 18930 18930
=======================================
Hits 17571 17571
Misses 1359 1359Continue to review full report at Codecov.
|
|
Thanks @ElDeveloper ! I've fixed the rendering error and I've added a comment about timelines. I agree with @jdereus on keeping the URL of the test systems internal. |
Sounds good. Thanks for making the changes @josenavas |
antgonza
pushed a commit
that referenced
this pull request
Sep 19, 2017
* replace printable for try/except utf-8 * add sleeps for tests * moving wait_for_prep_information_job * just leaving the changes on this pr * Fixing tests * Reverting changes * dist: precise * addressing @josenavas comments * fix-2212 * Adding branch description to Contributing (#2256) * Adding branch description * Adding spaces * Adding timeline * upgrading software * mv r_client to qiita * from redis import Redis * rm moi and ipython * Move qiita_db/private.py -> qiita_ware/private_plugin.py * _system_call as system_call * flake8 * rm create_raw_data * Transferring VAMPS submission to internal job * rm other unnecessary files * addressing @josenavas comment * Fixing merge conflicts * Adding tests to private plugin * rm wrapper.py * Removing import * Fixing import * Modifying GUI to use the plugin * moving qiita pet in .travis.yml * Transfer submit to vamps (#2265) * Move qiita_db/private.py -> qiita_ware/private_plugin.py * Transferring VAMPS submission to internal job * Fixing import * some other .travis.yml fixes * addressing @josenavas comment * Adding success test * adding some methods * flake8 * Transfer copy raw data (#2267) * Move qiita_db/private.py -> qiita_ware/private_plugin.py * Transferring VAMPS submission to internal job * Fixing merge conflicts * Adding tests to private plugin * Removing import * Fixing import * Modifying GUI to use the plugin * Adding success test * change imports * adding delete_artifact and create_sample_template * fixing errors and gui * fix delete error * ENH: Make jobs list modal With some recent changes to the position of the navigation bar, the header of the jobs list is cut from screen. With this patch in place, the jobs list will be shown as a modal window, so that won't be a problem anymore. * Transfer update delete templates (#2274) * Moving update_sample_template * Transfer update_sample_template * Porting update prep template * Moving delete sample or column * Removing tests * Removing dispatchable and its tests * Updating interface to use the new functionality' * Adapting the prep template GUI * Submitting jobs * Fixing tests * Removing qiita_ware/context.py * flake8ing * Fixing _system_call * Safeguarding the call to rollback * Unmasking more errors * Forcing different connections on different processes * Moving job completion to internal plugin structure * Removing unused code * Forcing the creation of a new transaction on the jobs * Fixing tests * forcing the commit * Fixing all tests * Addressing @antgonza's comments * Addressing @antgonza's comment * Addressing @ElDeveloper's comments * BUG: Fix job updates * Fixing the redis DB (#2277) * Fixing the redis DB * Addressing @antgonza's comments * redbiom install * redbiom to install_requires * mv moi-ws to qiita_websocket * init commit * addressing @wasade comment * rm webdis.log * cleaning code for initial review * install latest redbiom * fix test * ENH: Change phrasing of upload text (#2281) * ENH: Change phrasing of upload text As per a user's request. * Fix typo in docs Fixes #2259 * addressing @wasade comments and adding other tests * flake8 * addressing @josenavas comments * fix #2258 * fix #2258 * fix #858 (#2286) * addressing @ElDeveloper and @josenavas comments * @ElDeveloper :| * redbiom now adds per sample studies to analysis * jobs-list-as-modal * addresssing @josenavas comments * rm () from update_processing_job_data * add prints to review errors * rm prints * Fix 2190 (#2292) * Adding patch to add the 'name' parameter to all validate commands * Adding the parameter 'name' automatically and adding a test for it * Removing extra blank line * Adding dflt value to artifact name * Edited the wrong file * Adding user defined name at creation time * Fixing test * add is_from_analysis to artifact_handlers (#2293) * add is_from_analysis to artifact_handlers * fix test_post_metadata * fix error * WIP: rm sudo from travis * adding sed for config file * fix sed * rm & * cat redis.conf * using local redis.conf * # protected-mode yes * # supervised no * redis-server --port 7777 & * Fix 1293 (#2291) * fix #1293 * flake8 * fix errors * addressing @ElDeveloper comments * rm redis.conf * fix awaiting_approval list bug * Fix #2276 (#2294) * Fix #2276 * Factoring out generate nginx directory file list * Factoring out the nginx file list writing * Factoring out generating the file list of an artifact * Factoring out the header setting * Addressing @antgonza's comment * Addressing @wasade's comments
antgonza
pushed a commit
that referenced
this pull request
Oct 31, 2017
* replace printable for try/except utf-8 * add sleeps for tests * moving wait_for_prep_information_job * just leaving the changes on this pr * Fixing tests * Reverting changes * dist: precise * addressing @josenavas comments * fix-2212 * Adding branch description to Contributing (#2256) * Adding branch description * Adding spaces * Adding timeline * upgrading software * mv r_client to qiita * from redis import Redis * rm moi and ipython * Move qiita_db/private.py -> qiita_ware/private_plugin.py * _system_call as system_call * flake8 * rm create_raw_data * Transferring VAMPS submission to internal job * rm other unnecessary files * addressing @josenavas comment * Fixing merge conflicts * Adding tests to private plugin * rm wrapper.py * Removing import * Fixing import * Modifying GUI to use the plugin * moving qiita pet in .travis.yml * Transfer submit to vamps (#2265) * Move qiita_db/private.py -> qiita_ware/private_plugin.py * Transferring VAMPS submission to internal job * Fixing import * some other .travis.yml fixes * addressing @josenavas comment * Adding success test * adding some methods * flake8 * Transfer copy raw data (#2267) * Move qiita_db/private.py -> qiita_ware/private_plugin.py * Transferring VAMPS submission to internal job * Fixing merge conflicts * Adding tests to private plugin * Removing import * Fixing import * Modifying GUI to use the plugin * Adding success test * change imports * adding delete_artifact and create_sample_template * fixing errors and gui * fix delete error * ENH: Make jobs list modal With some recent changes to the position of the navigation bar, the header of the jobs list is cut from screen. With this patch in place, the jobs list will be shown as a modal window, so that won't be a problem anymore. * Transfer update delete templates (#2274) * Moving update_sample_template * Transfer update_sample_template * Porting update prep template * Moving delete sample or column * Removing tests * Removing dispatchable and its tests * Updating interface to use the new functionality' * Adapting the prep template GUI * Submitting jobs * Fixing tests * Removing qiita_ware/context.py * flake8ing * Fixing _system_call * Safeguarding the call to rollback * Unmasking more errors * Forcing different connections on different processes * Moving job completion to internal plugin structure * Removing unused code * Forcing the creation of a new transaction on the jobs * Fixing tests * forcing the commit * Fixing all tests * Addressing @antgonza's comments * Addressing @antgonza's comment * Addressing @ElDeveloper's comments * BUG: Fix job updates * Fixing the redis DB (#2277) * Fixing the redis DB * Addressing @antgonza's comments * redbiom install * redbiom to install_requires * mv moi-ws to qiita_websocket * init commit * addressing @wasade comment * rm webdis.log * cleaning code for initial review * install latest redbiom * fix test * ENH: Change phrasing of upload text (#2281) * ENH: Change phrasing of upload text As per a user's request. * Fix typo in docs Fixes #2259 * addressing @wasade comments and adding other tests * flake8 * addressing @josenavas comments * fix #2258 * fix #2258 * fix #858 (#2286) * addressing @ElDeveloper and @josenavas comments * @ElDeveloper :| * redbiom now adds per sample studies to analysis * jobs-list-as-modal * addresssing @josenavas comments * rm () from update_processing_job_data * add prints to review errors * rm prints * Fix 2190 (#2292) * Adding patch to add the 'name' parameter to all validate commands * Adding the parameter 'name' automatically and adding a test for it * Removing extra blank line * Adding dflt value to artifact name * Edited the wrong file * Adding user defined name at creation time * Fixing test * add is_from_analysis to artifact_handlers (#2293) * add is_from_analysis to artifact_handlers * fix test_post_metadata * fix error * WIP: rm sudo from travis * adding sed for config file * fix sed * rm & * cat redis.conf * using local redis.conf * # protected-mode yes * # supervised no * redis-server --port 7777 & * Fix 1293 (#2291) * fix #1293 * flake8 * fix errors * addressing @ElDeveloper comments * rm redis.conf * fix awaiting_approval list bug * Fix #2276 (#2294) * Fix #2276 * Factoring out generate nginx directory file list * Factoring out the nginx file list writing * Factoring out generating the file list of an artifact * Factoring out the header setting * Addressing @antgonza's comment * Addressing @wasade's comments * Fixing patch * fix error * Fixing failing test * fix #2214 * addressing @josenavas comment * fix #2209 * fix #2331 * fix #2326 (#2328) * fix #2326 * addressing @ElDeveloper comment * fix #2226 (#2330) * fix #2226 * addressing @ElDeveloper comment * fix #2336 * fix #2316 * Fixes 2269 * addressing @josenavas comments * Fixes 2038 (#2349) * fixes #2038 * Adding test * Trying to debug * Checking value * More debugging * Undo changes * Fixing failure * fix #2333 * addressing @josenavas * fixes #2245 (#2350) * fixes #2245 * Addressing @antgonza's comments * Fixing test * Fixing Qiita installation (#2362) * Sync-ing with master (#2367) * fix calls to system_call and ebi submissions * fixing errors * fix if state == submitting: * just raise error * EBISubmissionError -> ComputeError * fix #2084 (#2365) * fix #2125 (#2366) * fix #2125 * fix error * fix #2364 * fix #1812 * add tests * flake8 * populating ProcessingJob.create True * fix more errors * addressing comments from @josenavas and @stephanieorch * mv ProcessingJob.create True around * Partial #2237 (#2368) * fix calls to system_call and ebi submissions * fixing errors * fix if state == submitting: * just raise error * EBISubmissionError -> ComputeError * Sorting values * Case insensitive sorting * Addressing @ElDeveloper's comments * fix-1591 (#2370) * fix-1591 * removing warning ATTN @josenavas, fix tests * addressing @ElDeveloper and @josenavas comments * Fix 2230 (#2372) * fix calls to system_call and ebi submissions * fixing errors * fix if state == submitting: * just raise error * EBISubmissionError -> ComputeError * Fix #2230 solved using modal in order to prevent large file download * Function moved into in order to keep order. Some details fixed. * addressing @wasade and @ElDeveloper comments * fixing errors * fix GUI and erros * addressing @ElDeveloper comments * rm artifacts from parameters listing * fix flake8 * fix ilike quote params * addressing @josenavas comment and adding test for job without children * fix errors * addressing @josenavas comment * Fixing network labels (#2376) * Fixing network labels * Fixing error * Update redbiom.html * Update redbiom.html * Update redbiom.html * Patch 61 - transfer all parameters to str (#2379) * Patch 61 - transfer all parameters to str * Fixing errors * rm lower from redbiom * fixing smal details and adding emp_release1 * fixing
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.
Adding a description of the branches to the CONTRIBUTING.md file