Skip to content

Commit

Permalink
Add .circleci/config.yml (#1122)
Browse files Browse the repository at this point in the history
* Add .circleci/config.yml

* Change test command

* Add postgres

* Add linting to config

* Fixed linting error

* Update version of isort

* Remove travis ci config

* Add circleci badge to readme
  • Loading branch information
okaycj authored Feb 28, 2023
1 parent be6278d commit 7c2c081
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 36 deletions.
31 changes: 31 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
version: 2.1
orbs:
python: circleci/[email protected]
jobs:
build-and-test:
docker:
- image: cimg/python:3.9
- image: cimg/postgres:9.6
steps:
- checkout
- python/install-packages:
pkg-manager: poetry
- run:
name: Run tests
command: poetry run ./manage.py test --failfast
build-and-lint:
docker:
- image: cimg/python:3.9
steps:
- checkout
- python/install-packages:
pkg-manager: poetry
- run:
name: Run linters
command: poetry run pre-commit run --all-files

workflows:
sample:
jobs:
- build-and-test
- build-and-lint
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ repos:
- id: autoflake
args: ['--in-place', '--recursive', '--remove-all-unused-imports', '--expand-star-imports', '--remove-duplicate-keys', '--ignore-init-module-imports', '--remove-unused-variables']
- repo: https://github.com/timothycrosley/isort
rev: 5.10.1
rev: 5.12.0
hooks:
- id: isort
- repo: https://github.com/psf/black
Expand Down
28 changes: 0 additions & 28 deletions .travis.yml

This file was deleted.

8 changes: 2 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
# Lookit-api

[![CircleCI](https://dl.circleci.com/status-badge/img/gh/lookit/lookit-api/tree/develop.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/lookit/lookit-api/tree/develop)

For full documentation, see <http://lookit.readthedocs.io> (source: <https://github.com/lookit/lookit-docs/>)

This is the codebase for the Lookit project, an online developmental laboratory. It includes an Experimenter platform for designing and administering research studies, and a participant-facing platform where users can signup and take part in studies. It is built using Django, PostgreSQL, and Ember.js (see Ember portion of codebase, [ ember-lookit-frameplayer](https://github.com/lookit/ember-lookit-frameplayer)), and is developed by [MIT](https://mit.edu) and [Center for Open Science](https://cos.io/).

`master` Build Status: [![Build Status](https://travis-ci.org/lookit/lookit-api.svg?branch=master)](https://travis-ci.org/lookit/lookit-api)

`develop` Build Status: [![Build Status](https://travis-ci.org/lookit/lookit-api.svg?branch=develop)](https://travis-ci.org/lookit/lookit-api)

[![Codetree](https://codetree.com/images/managed-with-codetree.svg)](https://codetree.com/projects/h9M5)
2 changes: 1 addition & 1 deletion studies/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class Lab(models.Model):
default=None,
verbose_name="Custom URL Slug",
help_text="A unique URL ending (slug) for the webpage that will show any discoverable, active studies for this lab. "
"For example, entering \"my-lab-name\" in this box will produce the custom URL \"https://lookit.mit.edu/studies/my-lab-name\" "
'For example, entering "my-lab-name" in this box will produce the custom URL "https://lookit.mit.edu/studies/my-lab-name" '
"for this lab. Slugs should not contain spaces and can contain letters, numbers, underscores, and/or hyphens.",
)
institution = models.CharField(max_length=255, blank=True)
Expand Down

0 comments on commit 7c2c081

Please sign in to comment.