Skip to content
This repository was archived by the owner on Apr 3, 2025. It is now read-only.

Commit aac76d7

Browse files
authored
Merge pull request #1092 from facebookresearch/v1.2-dev
Code for release v1.2
2 parents 64a23a9 + aba6369 commit aac76d7

File tree

980 files changed

+40321
-38700
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

980 files changed

+40321
-38700
lines changed

._data

4 KB
Binary file not shown.

.github/workflows/cypress-end-to-end-tests.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ on:
77
branches: [main]
88
paths-ignore:
99
- "**.md"
10+
env:
11+
HYDRA_FULL_ERROR: 1
1012
jobs:
1113
# This job is made to setup path filtering, learn more about it here: https://github.com/facebookresearch/Mephisto/pull/857
1214
changes:
@@ -108,7 +110,7 @@ jobs:
108110
browser: chrome
109111
project: ./mephisto/abstractions/blueprints/static_html_task/source
110112
config-file: ./cypress.config.js
111-
start: python ./examples/simple_static_task/static_test_script.py
113+
start: python ./examples/simple_static_task/run_task.py
112114
wait-on: "http://localhost:3000/?worker_id=x&assignment_id=1"
113115
headless: true
114116

@@ -273,7 +275,9 @@ jobs:
273275
node-version: 16.16.0
274276

275277
- name: 🤖 Install Mephisto
276-
run: pip install -e .
278+
run: |
279+
pip install -e .
280+
pip install detoxify
277281
278282
- name: 🖋 Create data directory
279283
run: mkdir -p ~/mephisto/data

.gitignore

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ mephisto/scripts/metrics/*
2525

2626
# Examples
2727
examples/simple_static_task/hydra_configs/conf/*
28-
!examples/simple_static_task/hydra_configs/conf/example.yaml
28+
!examples/simple_static_task/hydra_configs/conf/example*.yaml
2929
!examples/simple_static_task/hydra_configs/conf/prolific_example.yaml
30-
!examples/simple_static_task/hydra_configs/conf/onboarding_example.yaml
30+
!examples/simple_static_task/hydra_configs/conf/onboarding_example*.yaml
3131
examples/**/build/*
3232

3333
# PyCharm
@@ -55,3 +55,6 @@ aws_credentials
5555
docker-compose.local.*
5656
env.local
5757
my-review-interface
58+
docker/entrypoints/*.sh
59+
!docker/entrypoints/server.mturk.sh
60+
!docker/entrypoints/server.prolific.sh

.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

Lines changed: 14 additions & 14 deletions
Large diffs are not rendered by default.

.yarn/plugins/@yarnpkg/plugin-version.cjs

Lines changed: 14 additions & 14 deletions
Large diffs are not rendered by default.

.yarn/releases/yarn-3.2.4.cjs

Lines changed: 8 additions & 9 deletions
Large diffs are not rendered by default.

CODE_OF_CONDUCT.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
<!---
2+
Copyright (c) Meta Platforms and its affiliates.
3+
This source code is licensed under the MIT license found in the
4+
LICENSE file in the root directory of this source tree.
5+
-->
6+
17
# Code of Conduct
28

39
## Our Pledge

CONTRIBUTING.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
<!---
2+
Copyright (c) Meta Platforms and its affiliates.
3+
This source code is licensed under the MIT license found in the
4+
LICENSE file in the root directory of this source tree.
5+
-->
6+
17
# Contributing to Mephisto
28
We want to make contributing to this project as easy and transparent as
39
possible.

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ COPY . /mephisto
1616
RUN mkdir ~/.mephisto
1717

1818
# Create the main Mephisto data directory
19-
RUN mkdir /mephisto/data
19+
RUN mkdir -p /mephisto/data
2020

2121
# Write the mephisto config file manually for now to avoid prompt.
2222
# For bash-style string $ expansion for newlines,

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) Facebook, Inc. and its affiliates.
3+
Copyright (c) Meta Platforms and its affiliates.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)