diff --git a/.circleci/config.yml b/.circleci/config.yml index c04ce61e..a71889d5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ jobs: steps: - checkout - run: - name: Set up environment + name: Run tests command: | conda create -n py36_env python=3.6 numpy pytest matplotlib -yq source activate py36_env diff --git a/assets/images/projects/2014-08-15-physics-learning.png b/assets/images/projects/2014-08-15-physics-learning.png index 8bd4da80..fbe3ba96 100644 Binary files a/assets/images/projects/2014-08-15-physics-learning.png and b/assets/images/projects/2014-08-15-physics-learning.png differ diff --git a/assets/images/projects/2015-09-25-abcd.jpg b/assets/images/projects/2015-09-25-abcd.jpg deleted file mode 100644 index b60f8d3d..00000000 Binary files a/assets/images/projects/2015-09-25-abcd.jpg and /dev/null differ diff --git a/assets/images/projects/2015-09-25-abcd.png b/assets/images/projects/2015-09-25-abcd.png new file mode 100644 index 00000000..9d9cadc7 Binary files /dev/null and b/assets/images/projects/2015-09-25-abcd.png differ diff --git a/assets/images/projects/2015-12-01-mmmm.png b/assets/images/projects/2015-12-01-mmmm.png index 3e338502..ed7c2203 100644 Binary files a/assets/images/projects/2015-12-01-mmmm.png and b/assets/images/projects/2015-12-01-mmmm.png differ diff --git a/assets/images/projects/2016-05-01-hiv-cannabis.jpg b/assets/images/projects/2016-05-01-hiv-cannabis.jpg deleted file mode 100644 index a1004fd3..00000000 Binary files a/assets/images/projects/2016-05-01-hiv-cannabis.jpg and /dev/null differ diff --git a/assets/images/projects/2016-05-01-hiv-cannabis.png b/assets/images/projects/2016-05-01-hiv-cannabis.png new file mode 100644 index 00000000..6df43489 Binary files /dev/null and b/assets/images/projects/2016-05-01-hiv-cannabis.png differ diff --git a/assets/images/projects/2016-08-17-athena.png b/assets/images/projects/2016-08-17-athena.png index 708d5631..eda3dc93 100644 Binary files a/assets/images/projects/2016-08-17-athena.png and b/assets/images/projects/2016-08-17-athena.png differ diff --git a/assets/images/projects/2017-04-03-pace.png b/assets/images/projects/2017-04-03-pace.png new file mode 100644 index 00000000..a28f2580 Binary files /dev/null and b/assets/images/projects/2017-04-03-pace.png differ diff --git a/assets/images/projects/2017-09-20-ace.png b/assets/images/projects/2017-09-20-ace.png index b5f8b309..f2d8c451 100644 Binary files a/assets/images/projects/2017-09-20-ace.png and b/assets/images/projects/2017-09-20-ace.png differ diff --git a/assets/images/projects/2018-01-15-nimare.png b/assets/images/projects/2018-01-15-nimare.png index e13a79ea..abe707a5 100644 Binary files a/assets/images/projects/2018-01-15-nimare.png and b/assets/images/projects/2018-01-15-nimare.png differ diff --git a/assets/images/projects/2018-01-16-metacurious.png b/assets/images/projects/2018-01-16-metacurious.png index c3462237..bd9b6d30 100644 Binary files a/assets/images/projects/2018-01-16-metacurious.png and b/assets/images/projects/2018-01-16-metacurious.png differ diff --git a/assets/images/projects/2018-10-05-diva.png b/assets/images/projects/2018-10-05-diva.png index c0ac3bf6..77e43470 100644 Binary files a/assets/images/projects/2018-10-05-diva.png and b/assets/images/projects/2018-10-05-diva.png differ diff --git a/assets/images/projects/2018-10-05-seaas.png b/assets/images/projects/2018-10-05-seaas.png index 853c4d3f..67f6d287 100644 Binary files a/assets/images/projects/2018-10-05-seaas.png and b/assets/images/projects/2018-10-05-seaas.png differ diff --git a/assets/images/projects/2018-01-16-metacurious-banner.png b/assets/images/projects/metacurious_banner.png similarity index 100% rename from assets/images/projects/2018-01-16-metacurious-banner.png rename to assets/images/projects/metacurious_banner.png diff --git a/assets/themes/lab/images/logo/favicon.ico b/assets/themes/lab/images/logo/favicon.ico old mode 100755 new mode 100644 index 318d65fe..c4c18c5b Binary files a/assets/themes/lab/images/logo/favicon.ico and b/assets/themes/lab/images/logo/favicon.ico differ diff --git a/assets/themes/lab/images/logo/favicon.png b/assets/themes/lab/images/logo/favicon.png old mode 100755 new mode 100644 index 318d65fe..c4c18c5b Binary files a/assets/themes/lab/images/logo/favicon.png and b/assets/themes/lab/images/logo/favicon.png differ diff --git a/assets/themes/lab/images/logo/logo.png b/assets/themes/lab/images/logo/logo.png old mode 100755 new mode 100644 index 318d65fe..c4c18c5b Binary files a/assets/themes/lab/images/logo/logo.png and b/assets/themes/lab/images/logo/logo.png differ diff --git a/projects/_posts/2015-09-25-abcd.md b/projects/_posts/2015-09-25-abcd.md index 82421641..abd3edd9 100755 --- a/projects/_posts/2015-09-25-abcd.md +++ b/projects/_posts/2015-09-25-abcd.md @@ -10,7 +10,7 @@ type: dataset website: "https://abcdstudy.org/" grant: grant_url: -image: /assets/images/projects/2015-09-25-abcd.jpg +image: /assets/images/projects/2015-09-25-abcd.png tagline: '"The largest long-term study of brain development and child health in the United States."' tags: [fmri] diff --git a/projects/_posts/2016-05-01-hiv-cannabis.md b/projects/_posts/2016-05-01-hiv-cannabis.md index 328f92a9..4d61a296 100755 --- a/projects/_posts/2016-05-01-hiv-cannabis.md +++ b/projects/_posts/2016-05-01-hiv-cannabis.md @@ -10,7 +10,7 @@ type: dataset website: grant: NIH-5K01DA037819-03 grant_url: https://projectreporter.nih.gov/project_info_description.cfm?projectnumber=5K01DA037819-03 -image: /assets/images/projects/2016-05-01-hiv-cannabis.jpg +image: /assets/images/projects/2016-05-01-hiv-cannabis.png tagline: How do cannabis use and HIV infection impact the brain? tags: [fmri] diff --git a/projects/_posts/2017-04-03-pace.md b/projects/_posts/2017-04-03-pace.md index fb1c0e16..e9552cbc 100644 --- a/projects/_posts/2017-04-03-pace.md +++ b/projects/_posts/2017-04-03-pace.md @@ -10,7 +10,7 @@ type: dataset website: grant: R01DA041353 grant_url: https://taggs.hhs.gov/Detail/AwardDetail?arg_AwardNum=R01DA041353&arg_ProgOfficeCode=114 -image: +image: /assets/images/projects/2017-04-03-pace.png tagline: Better understanding the neurobiology of addiction through meta-analysis. tags: [meta-analysis] diff --git a/projects/_posts/2018-01-16-metacurious.md b/projects/_posts/2018-01-16-metacurious.md index 7914fcb1..98f08f06 100644 --- a/projects/_posts/2018-01-16-metacurious.md +++ b/projects/_posts/2018-01-16-metacurious.md @@ -22,7 +22,7 @@ osf: --- {% include JB/setup %} -# +# Bringing together human cleverness and big data, metaCurious is a tool to help you curate and annotate version-controlled collections of neuroimaging articles for meta-analyses. This tool facilitates collaboration and reproducibility by building sharable collections as GitHub repositories, providing a front end to [Brainspell-neo](https://brainspell.herokuapp.com), which started from Roberto Toro's Brainspell, itself based on Tal Yarkoni's [NeuroSynth](http://neurosynth.org): standing on the shoulders of Giants! MetaCurious is developed in conjunction with a number of external collaborators, including the project leader, [Anisha Keshavan](https://github.com/akeshavan), as well as [JB Poline](https://github.com/jbpoline), [Greg Kiar](https://github.com/gkiar), and [Elizabeth DuPre](https://github.com/emdupre). The primary developer within the lab for metaCurious is [Katie Bottenhorn](/team/bottenhorn-katherine). diff --git a/projects/index.html b/projects/index.html index 8546347e..14882ee5 100644 --- a/projects/index.html +++ b/projects/index.html @@ -55,7 +55,7 @@
- +
@@ -93,7 +93,7 @@
- +
@@ -131,7 +131,7 @@
- +
@@ -169,7 +169,7 @@
- +
diff --git a/tests/test_team_pictures.py b/tests/test_images.py similarity index 52% rename from tests/test_team_pictures.py rename to tests/test_images.py index e6ebe66d..098de9df 100644 --- a/tests/test_team_pictures.py +++ b/tests/test_images.py @@ -34,3 +34,32 @@ def test_team_image_sizes(testdata): if len(failures): failures = sorted(list(set(failures))) raise Exception('Test failed on {}'.format(', '.join(failures))) + + +def test_project_image_sizes(testdata): + """ + Test that project photos are the right size. + """ + photo_folder = os.path.join(testdata["assets"], "images", "projects") + target_dims = (400, 400) # in pixels + target_ratio = 1 # width to height + # Non-logo images should not have "-" in the filenames + patterns = ["*-*.png", "*-*.jpg"] + files = [glob(os.path.join(photo_folder, p)) for p in patterns] + files = [item for sublist in files for item in sublist] + if not len(files): + raise Exception("No files found in {}".format(photo_folder)) + + failures = [] + for f in files: + fname = os.path.basename(f) + img = plt.imread(f) + if (img.shape[0] > target_dims[0]) or (img.shape[1] > target_dims[1]): + failures.append(fname) + + if (img.shape[0] / img.shape[1]) != target_ratio: + failures.append(fname) + + if len(failures): + failures = sorted(list(set(failures))) + raise Exception('Test failed on {}'.format(', '.join(failures)))