Skip to content
This repository was archived by the owner on Oct 21, 2025. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .github/workflows/integ_e2e_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Set up Python 3.8
- name: Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: 3.10

- name: Install Python packages
run: |
Expand All @@ -57,10 +57,10 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Set up Python 3.8
- name: Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: 3.10

- name: Install Python packages
run: |
Expand All @@ -69,4 +69,4 @@ jobs:

- name: Ondocker runner
id: onedocker_runner
run: python3.8 -m onedocker.script.runner ls --version=latest --repository_path=local --exe_path="/usr/bin/"
run: python3.10 -m onedocker.script.runner ls --version=latest --repository_path=local --exe_path="/usr/bin/"
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v4
with:
python-version: '3.8'
python-version: '3.10'

- name: Install Dependencies
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish_project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
version_check: ${{ steps.version_check.outputs.version_check }}
steps:
- uses: actions/checkout@master
- name: Set up Python 3.8
- name: Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: 3.10
- name: Install packages
run: >-
python3 -m
Expand All @@ -37,10 +37,10 @@ jobs:
if : needs.check-package-version.outputs.version_check == 'higher'
steps:
- uses: actions/checkout@master
- name: Set up Python 3.8
- name: Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: 3.10
- name: Install pypa/build
run: >-
python3 -m
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pyre.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v4
with:
python-version: '3.8'
python-version: '3.10'

- name: Install Dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v4
with:
python-version: '3.8'
python-version: '3.10'

- name: Install Package
run: |
Expand Down
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,46 +8,46 @@ FBPCP (Facebook Private Computation Platform) is a secure, privacy safe and scal
## Installation Requirements:
### Prerequisites for working on Ubuntu 18.04:
* An AWS account (Access Key ID, Secret Access Key) to use AWS SDK (boto3 API) in FBPCP
* python >= 3.8
* python >= 3.10
* python3-pip

## Installing prerequisites on Ubuntu 18.04:
* python3.8
* python3.10
```sh
sudo apt-get install -y python3.8
sudo apt-get install -y python3.10
```
* python3-pip
```sh
sudo apt-get install -y python3-pip
```
## Installing fbpcp
```sh
python3.8 -m pip install 'git+https://github.com/facebookresearch/fbpcp.git'
python3.10 -m pip install 'git+https://github.com/facebookresearch/fbpcp.git'
# (add --user if you don't have permission)

# Or, to install it from a local clone:
git clone https://github.com/facebookresearch/fbpcp.git
python3.8 -m pip install -e fbpcp
python3.10 -m pip install -e fbpcp
# (add --user if you don't have permission)

# Or, to install it from Pypi
python3.8 -m pip install fbpcp
python3.10 -m pip install fbpcp
```

## Upgrading fbpcp
* To latest version in github main branch
```sh
python3.8 -m pip uninstall fbpcp
python3.10 -m pip uninstall fbpcp
# uninstall fbpcp first

python3.8 -m pip install 'git+https://github.com/facebookresearch/fbpcp.git'
python3.10 -m pip install 'git+https://github.com/facebookresearch/fbpcp.git'
# (add --user if you don't have permission)
# re-install fbpcp from github repository
```

* To latest version in Pypi
```sh
python3.8 -m pip install fbpcp --upgrade
python3.10 -m pip install fbpcp --upgrade
```

## Architecture
Expand Down
2 changes: 1 addition & 1 deletion fbpcp/service/onedocker.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

ONEDOCKER_CMD_PREFIX = (
# patternlint-disable-next-line f-string-may-be-missing-leading-f
"python3.8 -m onedocker.script.runner {package_name} {runner_args}"
"python3.10 -m onedocker.script.runner {package_name} {runner_args}"
)

DEFAULT_BINARY_VERSION = "latest"
Expand Down
8 changes: 4 additions & 4 deletions pce/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ MPC(Multi Party Computation) Roles includes publisher and partner. If you donot
You need to install through fbpcp [README](https://github.com/facebookresearch/fbpcp/blob/main/README.md).

## PCE Validator Usage
python3.8 -m pce.validator --region=<region> --key-id=<key_id> --key-data=<key_data> --pce-id=<pce_id> --role=<role>
python3.10 -m pce.validator --region=<region> --key-id=<key_id> --key-data=<key_data> --pce-id=<pce_id> --role=<role>

Example1: for resources tagged with {"pce:pce-id": "test-pce-tag-value"}
python3.8 -m pce.validator --region=us-west-2 --key-id=AWS_ACCESS_KEY_ID --key-data=AWS_SECRET_ACCESS_KEY --pce-id="test-pce-tag-value"
python3.10 -m pce.validator --region=us-west-2 --key-id=AWS_ACCESS_KEY_ID --key-data=AWS_SECRET_ACCESS_KEY --pce-id="test-pce-tag-value"

Example2: if your host has AWS environment variables setup, you can remove --key-id= and --key-data
python3.8 -m pce.validator --region=us-west-2 --pce-id="test-pce-tag-value"
python3.10 -m pce.validator --region=us-west-2 --pce-id="test-pce-tag-value"

Example3: you can optionally pass in the role, the output will stay the same
python3.8 -m pce.validator --region=us-west-2 --pce-id="test-pce-tag-value" --role partner
python3.10 -m pce.validator --region=us-west-2 --pce-id="test-pce-tag-value" --role partner
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@
packages=find_packages(),
long_description_content_type="text/markdown",
long_description=long_description,
python_requires=">=3.8",
python_requires=">=3.10",
)
8 changes: 3 additions & 5 deletions tests/service/test_onedocker.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,10 +218,8 @@ def test_start_containers_throw_with_invalid_env_var_list(self):
)

def test_get_cmd(self):
expected_cmd_without_arguments = (
f"python3.8 -m onedocker.script.runner {TEST_PACKAGE_NAME} --version=latest"
)
expected_cmd_with_arguments = f"python3.8 -m onedocker.script.runner {TEST_PACKAGE_NAME} --exe_args={TEST_CMD_ARGS_LIST[0]} --version={TEST_VERSION} --timeout={TEST_TIMEOUT}"
expected_cmd_without_arguments = f"python3.10 -m onedocker.script.runner {TEST_PACKAGE_NAME} --version=latest"
expected_cmd_with_arguments = f"python3.10 -m onedocker.script.runner {TEST_PACKAGE_NAME} --exe_args={TEST_CMD_ARGS_LIST[0]} --version={TEST_VERSION} --timeout={TEST_TIMEOUT}"
cmd_without_arguments = self.onedocker_svc._get_cmd(TEST_PACKAGE_NAME)
cmd_with_arguments = self.onedocker_svc._get_cmd(
TEST_PACKAGE_NAME, TEST_VERSION, TEST_CMD_ARGS_LIST[0], TEST_TIMEOUT
Expand Down Expand Up @@ -256,7 +254,7 @@ def test_get_cmd_with_certificate_request(self):
"country_name": TEST_COUNTRY_NAME,
}
)
expected_cmd = f"python3.8 -m onedocker.script.runner {TEST_PACKAGE_NAME} --exe_args={quote(str(TEST_CMD_ARGS_LIST[0]))} --version={quote(str(TEST_VERSION))} --timeout={quote(str(TEST_TIMEOUT))} --cert_params={quote(str(cert_params))}"
expected_cmd = f"python3.10 -m onedocker.script.runner {TEST_PACKAGE_NAME} --exe_args={quote(str(TEST_CMD_ARGS_LIST[0]))} --version={quote(str(TEST_VERSION))} --timeout={quote(str(TEST_TIMEOUT))} --cert_params={quote(str(cert_params))}"

# Act
result = self.onedocker_svc._get_cmd(
Expand Down