Skip to content

Analysis refactor master #2070

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
3601c29
fix #1505
antgonza Jan 2, 2017
0d6788e
improving some GUI stuff
antgonza Jan 3, 2017
12406cc
improving some GUI stuff - missing lines
antgonza Jan 3, 2017
958fcbe
pull upstream master
antgonza Jan 4, 2017
a57ef23
addressing all comments
antgonza Jan 5, 2017
2ead7a6
ready for review
antgonza Jan 5, 2017
931e566
New DB structure
josenavas Jan 9, 2017
a2b883e
Adding python patch
josenavas Jan 9, 2017
e737f64
Adding a biom so we can actually execute the patch
josenavas Jan 9, 2017
6bc0303
Fixing the patch to correctly transfer the information from the old s…
josenavas Jan 12, 2017
331012d
Fixing patch
josenavas Jan 12, 2017
eabe25d
Fixing patch and a few other bits to make the patch run successfully
josenavas Jan 12, 2017
0c40bc0
These files are no longer needed
josenavas Jan 12, 2017
602acc3
Removing unused code
josenavas Jan 12, 2017
ad4deea
Droping analysis status table
josenavas Jan 12, 2017
aa3e96f
Linking the analysis with all the artifacts
josenavas Jan 12, 2017
d222e08
Fixing typo
josenavas Jan 12, 2017
14be3b0
Merge branch 'analysis-refactor-db' into analysis-refactor-fix-analysis
josenavas Jan 12, 2017
39f6beb
Fixing HTML and dbschema files
josenavas Jan 12, 2017
8c2be56
Merge branch 'analysis-refactor-db' into analysis-refactor-fix-analysis
josenavas Jan 12, 2017
4dd357c
Adding analyisis jobs
josenavas Jan 13, 2017
209e838
Merge branch 'analysis-refactor-db' into analysis-refactor-fix-analysis
josenavas Jan 13, 2017
b24833d
Extending the artifact to work with the analysis
josenavas Jan 13, 2017
8b7f222
Allowing multiomics datatype
josenavas Jan 13, 2017
b381993
Adding private_job_submitter and modifying proc job handler to use it
josenavas Jan 13, 2017
ab65fa2
Adding logging column to the analysis
josenavas Jan 13, 2017
40656f2
Merge branch 'analysis-refactor-db' into analysis-refactor-fix-analysis
josenavas Jan 13, 2017
c4c8420
Adding datatype to the analysis-processing job table
josenavas Jan 15, 2017
0cd9f27
Adding REST endpoint to access the analysis metadata
josenavas Jan 15, 2017
8207513
Adding private jobs to plugin
josenavas Jan 15, 2017
f307cd4
Fixing typo
josenavas Jan 15, 2017
78c8095
Fixing analysis
josenavas Jan 16, 2017
b3936c8
Fixing the processing jobs complete
josenavas Jan 16, 2017
19c3f7d
Removing the old job code
josenavas Jan 16, 2017
055b53e
Oops removed the wrong file
josenavas Jan 16, 2017
46c322d
Removing QiitaStatusObject because it is not used
josenavas Jan 16, 2017
4d2e14d
fixing metautil
josenavas Jan 16, 2017
befb4e2
Fixing porntal, setup and sql tests
josenavas Jan 16, 2017
09f2722
Fixing user and util
josenavas Jan 16, 2017
d1cdc8e
Fixing qiita_db
josenavas Jan 16, 2017
73a78e7
fix #1987
antgonza Jan 16, 2017
e64a22a
Merge pull request #2036 from antgonza/fix-1505
josenavas Jan 16, 2017
099b575
Merge branch 'master' of https://github.com/biocore/qiita into analys…
josenavas Jan 16, 2017
681e1cf
Updating to master
josenavas Jan 16, 2017
43eb1ed
Addressing @antgonza's comments
josenavas Jan 16, 2017
0dcae8b
Merge pull request #2047 from antgonza/fix-1987
josenavas Jan 17, 2017
4a5bbbc
initial commit
antgonza Jan 18, 2017
f99975c
requested changes
antgonza Jan 18, 2017
ed899a8
Merge pull request #2049 from antgonza/add-processing-suggestions
josenavas Jan 18, 2017
d508320
fix filter job list
antgonza Jan 18, 2017
025cc1e
Merge pull request #2050 from antgonza/fix-filter-job-list
josenavas Jan 18, 2017
599bcde
Fixing server cert (#2051)
josenavas Jan 19, 2017
d12ccfe
fix get_studies
antgonza Jan 20, 2017
b33983b
flake8
antgonza Jan 20, 2017
b4f1b1f
fix #503
antgonza Jan 20, 2017
62a1b93
fix #2010
antgonza Jan 20, 2017
2e36141
fix #1913
antgonza Jan 21, 2017
e006e20
fix errors
antgonza Jan 21, 2017
c174693
Merge pull request #2052 from antgonza/fix-get_studies
josenavas Jan 23, 2017
131dd6a
Merge pull request #2053 from antgonza/fix-by-blinking
josenavas Jan 23, 2017
ccb55bd
addressing @josenavas comment
antgonza Jan 24, 2017
dfe2e83
flake8
antgonza Jan 24, 2017
15fcceb
Merge pull request #2056 from antgonza/fix-1913
josenavas Jan 24, 2017
7f97f2a
fix #1010
antgonza Jan 26, 2017
9eb9dbb
fix #1066 (#2058)
antgonza Jan 26, 2017
23104d7
addressing @josenavas comments
antgonza Jan 27, 2017
1f1e826
fix #1961
antgonza Jan 27, 2017
19a9dda
fix #1837
antgonza Jan 27, 2017
19889f9
Automatic jobs & new stats (#2057)
antgonza Jan 27, 2017
4e380e0
Merge pull request #2060 from antgonza/fix-1961
wasade Jan 28, 2017
6f0dd71
generalizing this functionality
antgonza Jan 28, 2017
ed9fc65
fix #1816
antgonza Jan 29, 2017
d016833
Taking into account non-phylogenetic metrics in beta diversity
josenavas Jan 30, 2017
4b19b45
fix #1959
antgonza Jan 30, 2017
8d1f0c2
Merge branch 'analysis-refactor-fix-analysis' of github.com:josenavas…
josenavas Jan 30, 2017
894379c
Fixing merge conflicts
josenavas Jan 30, 2017
a80c0ac
Addressing @antgonza's comments
josenavas Feb 1, 2017
5d63afa
Merge branch 'analysis-refactor-fix-analysis' into analysis-refactor-…
josenavas Feb 1, 2017
c571bee
Merge branch 'analysis-refactor-remove-old' into analysis-refactor-qi…
josenavas Feb 1, 2017
d9b41e8
addressing @josenavas comments
antgonza Feb 1, 2017
005fc44
Merge branch 'analysis-refactor-qiita-db' into analysis-refactor-master
josenavas Feb 1, 2017
a4fceb7
Fixing merge conflicts
josenavas Feb 1, 2017
5ef06ae
addressing @josenavas comments
antgonza Feb 2, 2017
5e3504a
fixing error
antgonza Feb 2, 2017
d10096a
Merge branch 'master' of https://github.com/biocore/qiita into fix-1010
antgonza Feb 2, 2017
661342f
fixed?
antgonza Feb 2, 2017
fc649ab
Fixing merge conflicts
josenavas Feb 3, 2017
fcd249b
addressing @josenavas comments
antgonza Feb 3, 2017
e053c94
Actually fixing merge conflicts
josenavas Feb 3, 2017
f3c1216
Merge pull request #2063 from antgonza/fix-1816
josenavas Feb 3, 2017
a91a6fd
Merge pull request #2064 from antgonza/fix-1959
tanaes Feb 3, 2017
7b9fa6f
addressing @wasade comments
antgonza Feb 3, 2017
33bcbe5
Merge pull request #2059 from antgonza/fix-1010
josenavas Feb 3, 2017
5e4bd9b
Merge branch 'master' of https://github.com/biocore/qiita into fix-1837
antgonza Feb 3, 2017
8bf3d6e
fix flake8
antgonza Feb 3, 2017
7807bac
Merge pull request #2061 from antgonza/fix-1837
josenavas Feb 3, 2017
6360675
generate biom and metadata release (#2066)
antgonza Feb 3, 2017
811b7a7
database changes to fix 969
antgonza Feb 3, 2017
751d4ad
adding delete
antgonza Feb 3, 2017
65a86df
addressing @josenavas comments
antgonza Feb 3, 2017
b1817dd
addressing @ElDeveloper comments
antgonza Feb 4, 2017
18d77e1
duh!
antgonza Feb 4, 2017
01c656c
Merge pull request #2071 from antgonza/fix-969-db
josenavas Feb 6, 2017
4b78294
Solving merge conflicts
josenavas Feb 6, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,10 @@ script:
- qiita-env start_cluster qiita-general
- qiita-env make --no-load-ontologies
- if [ ${TEST_ADD_STUDIES} == "True" ]; then test_data_studies/commands.sh ; fi
- if [ ${TEST_ADD_STUDIES} == "True" ]; then qiita-cron-job ; fi
- if [ ${TEST_ADD_STUDIES} == "False" ]; then qiita-test-install ; fi
- if [ ${TEST_ADD_STUDIES} == "False" ]; then nosetests --with-doctest --with-coverage -v --cover-package=qiita_db,qiita_pet,qiita_core,qiita_ware; fi
- flake8 qiita_* setup.py scripts/qiita scripts/qiita-env scripts/qiita-test-install
- flake8 qiita_* setup.py scripts/*
- ls -R /home/travis/miniconda3/envs/qiita/lib/python2.7/site-packages/qiita_pet/support_files/doc/
- qiita pet webserver
addons:
Expand Down
24 changes: 12 additions & 12 deletions qiita_core/support_files/server.crt
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
-----BEGIN CERTIFICATE-----
MIICQzCCAawCCQDD7K/frIbu8DANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJV
MIICRTCCAa4CCQDPGmrQ4bra7TANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJV
UzELMAkGA1UECBMCQ0ExEjAQBgNVBAcTCVNhbiBEaWVnbzENMAsGA1UEChMEVUNT
RDETMBEGA1UECxMKS25pZ2h0IExhYjESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTE2
MTIxOTE2MDA1NFoXDTE3MDExODE2MDA1NFowZjELMAkGA1UEBhMCVVMxCzAJBgNV
BAgTAkNBMRIwEAYDVQQHEwlTYW4gRGllZ28xDTALBgNVBAoTBFVDU0QxEzARBgNV
BAsTCktuaWdodCBMYWIxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0B
AQEFAAOBjQAwgYkCgYEAq6ChN/5vk1fn45Ys5inttHe8IntBQtU31oKy+2IR+znT
GBvG/iht0veG5sbjlkm+Hn4auk5lR9EOmnTy+fl44LJ81rZuYmy3mjLSAHwmx7ee
ZTJ2lNjH/Blq5vC4VmPQ3Ka7zMusOTZSBDw6k8r6bxbMgarXc+rQtDvQfv2QITsC
AwEAATANBgkqhkiG9w0BAQUFAAOBgQBBir71K7HdTbU7129ZYLDyeXJfAjzCsSxj
evSqa6PJuh5PODdPyO01Hyxb5J/aHzmE5FRZKMLdgOTlqCpQjyMMvVc6UJzX5bZo
x6Y5gvoTNeCfaD0N6eZxxd7BqFGq+gmqk5U1cyKf+QjIhu/Q4p/Ga+Cx9b3t/Sk+
/iUPu/otBw==
RDETMBEGA1UECxMKS25pZ2h0IExhYjESMBAGA1UEAxMJbG9jYWxob3N0MCAXDTE3
MDExOTA4MTQ1NloYDzIxMTYxMjI2MDgxNDU2WjBmMQswCQYDVQQGEwJVUzELMAkG
A1UECBMCQ0ExEjAQBgNVBAcTCVNhbiBEaWVnbzENMAsGA1UEChMEVUNTRDETMBEG
A1UECxMKS25pZ2h0IExhYjESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3
DQEBAQUAA4GNADCBiQKBgQCroKE3/m+TV+fjlizmKe20d7wie0FC1TfWgrL7YhH7
OdMYG8b+KG3S94bmxuOWSb4efhq6TmVH0Q6adPL5+XjgsnzWtm5ibLeaMtIAfCbH
t55lMnaU2Mf8GWrm8LhWY9DcprvMy6w5NlIEPDqTyvpvFsyBqtdz6tC0O9B+/ZAh
OwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAGLau2DhrdnR5P2C2rGZuSaHLYCsVPJO
nj3Q+v5md1UzTDitlzHwM3pX1QBLxfiTJ6e7/0QLkrDceYKOfU/eucLGM1KG1YjS
nB39W2BNLKXu4QXWJUx4WC1Qxib9wbxxm4NyMb0ir2/PZTs+gKMtguBUyVHqETvs
n1b0mapYTJ/Q
-----END CERTIFICATE-----
9 changes: 9 additions & 0 deletions qiita_db/artifact.py
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,15 @@ def _associate_with_analysis(instance, analysis_id):
sql_args = [(instance.id, p.id) for p in parents]
qdb.sql_connection.TRN.add(sql, sql_args, many=True)

# inheriting visibility
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@antgonza can you review this section? This was added in master and I had a bit of trouble solving the conflicts in here but I think I end up placing this code in the correct location.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

visibilities = {a.visibility for a in instance.parents}
# set based on the "lowest" visibility
if 'sandbox' in visibilities:
instance.visibility = 'sandbox'
elif 'private' in visibilities:
instance.visibility = 'private'
else:
instance.visibility = 'public'
elif prep_template:
# This artifact is uploaded by the user in the
# processing pipeline
Expand Down
Loading