Skip to content
This repository has been archived by the owner on Aug 30, 2022. It is now read-only.

XP-227 - Merge v0.3.0 changes into master #233

Merged
merged 37 commits into from
Jan 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
9d2409e
:sparkles: XP-337 Clean up docs before generation (#188)
atymoshchuk Dec 18, 2019
c5f054d
:ambulance: Fix CI target branch
Dec 18, 2019
a60718e
:books: XP-229 Update Readme.md (#189)
atymoshchuk Dec 18, 2019
4ebc4b9
XP-255 update codeowners and authors in setup (#195)
PanicButtonPressed Dec 20, 2019
3f5d9c5
XP-265 move benchmarks to separate repo (#193)
PanicButtonPressed Dec 20, 2019
c1f319f
XP-257 cleanup cproto dir (#198)
wilk10 Dec 20, 2019
b476f6a
XP-261 move tests to own dir (#197)
wilk10 Dec 20, 2019
44c0433
:art: :arrow_up: XP-168 update setup.py (#191)
atymoshchuk Jan 2, 2020
4fa2905
DO-35 :newspaper: :sparkles: Add placeholder for e2e. Update CI for g…
Jan 2, 2020
e0dbe79
XP-241 remove legacy participant and sdk dir (#199)
wilk10 Jan 6, 2020
8c34902
DO-17 :whale: :sparkles: Add Dockerfiles, dockerignore and docs (#202)
Jan 6, 2020
83b8a64
XP-354 Remove proto files (#200)
Robert-Steiner Jan 6, 2020
af71072
XP-385 Fix docs badge (#204)
Robert-Steiner Jan 7, 2020
29548db
Xp 273 scripts cleanup (#206)
little-dude Jan 8, 2020
ecf53ea
XP-357 make controller parametrisable (#201)
wilk10 Jan 8, 2020
e6a7a05
XP-384 remove unused files (#209)
wilk10 Jan 8, 2020
24f0ec9
Do 43 docker compose minio (#208)
Jan 8, 2020
ce81c2a
XP-374 Clean up docs (#211)
Robert-Steiner Jan 9, 2020
bee2f36
XP-271 fix pylint issues (#210)
janpetschexain Jan 9, 2020
72b4c2b
XP-424 Remove unused packages (#212)
Robert-Steiner Jan 10, 2020
ed6af37
DO-49 :whale: :sparkles: Create initial buckets (#213)
Jan 10, 2020
43036cb
Xp 373 add sdk as dependency in fl (#214)
wilk10 Jan 13, 2020
f8914ac
XP-433 Fix docker headings (#218)
Robert-Steiner Jan 13, 2020
11e649a
XP-119 Fix gRPC testing setup so that it can run on macOS (#217)
Robert-Steiner Jan 13, 2020
d8c23a4
XP-422 ai metrics (#216)
janpetschexain Jan 13, 2020
af5e3a2
XP-308: store aggregated weights in S3 buckets (#215)
little-dude Jan 15, 2020
920f343
XP-436 Reinstate FINISHED heartbeat from Coordinator (#219)
finiteprods Jan 16, 2020
473950d
XP-480 revise message names (#222)
janpetschexain Jan 17, 2020
19d6b51
XP-499 Remove conftest, exclude tests folder (#223)
Robert-Steiner Jan 17, 2020
ac8da29
XP-333 Replace numproto with xain-proto (#220)
Robert-Steiner Jan 17, 2020
9155fb7
XP-505: docstrings cleanup (#224)
little-dude Jan 20, 2020
41b5c88
XP-508 Replace circleci badge (#225)
Robert-Steiner Jan 20, 2020
7bfd2eb
XP-510 allow for zero epochs on cli (#227)
janpetschexain Jan 20, 2020
50f61a3
XP-498: more generic shebangs (#229)
little-dude Jan 21, 2020
4351289
XP-505: cleanup docstrings in xain_fl.coordinator (#228)
little-dude Jan 21, 2020
46c161f
Prepare release of v0.3.0 (matching version with `xain-sdk` and `xain…
Jan 21, 2020
f7aa6af
XP-277 Fix reference to xain-sdk==0.3.0 on setup.py (#231)
Jan 21, 2020
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
156 changes: 18 additions & 138 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,143 +1,23 @@
# Project
results
output
docs

# Git
.git

# Pantsbuild
.pants.d
.pants.workdir.file_lock
.pants.workdir.file_lock.lock_message

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
**/__pycache__
*,cover
*.log
*.pyc
*.pyd
*.pyo
.Python
build/
develop-eggs/
#dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
pip-wheel-metadata/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.cache
.coverage
.coverage.*
.cache
nosetests.xml
.git
.github
.tox
Dockerfile
coverage.xml
*.cover
.hypothesis/
.pytest_cache/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
.python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don’t work, or not
# install all needed dependencies.
#Pipfile.lock

# celery beat schedule file
celerybeat-schedule

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
docs
env
nosetests.xml
pip-delete-this-directory.txt
pip-log.txt
scripts
tests
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/

# 
.DS_Store

# Editors
.idea
.vscode
10 changes: 0 additions & 10 deletions .editorconfig

This file was deleted.

13 changes: 13 additions & 0 deletions .github/workflows/development-e2e-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Comment-based E2E test

on:
pull_request_review_comment:
types: [created]

jobs:
e2e:
runs-on: ubuntu-18.04
steps:
- name: logging
if: github.event.comment.body == '/run e2e'
run: echo "$GITHUB_REF"
57 changes: 57 additions & 0 deletions .github/workflows/development.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: Lint and test (development)

on:
pull_request:
branches:
- development
jobs:
development:
runs-on: ubuntu-18.04
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Setup Python 3.6
uses: actions/setup-python@v1
with:
python-version: 3.6

- name: Cache pip packages
uses: actions/cache@v1
with:
path: ~/.cache/pip
key: pip-dev-${{ hashFiles('setup.py') }}

- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install --upgrade setuptools
pip install -e .[dev]

- name: black
run: |
black --line-length 100 --check setup.py xain_fl tests

- name: isort
run: |
isort --check-only --indent=4 -rc setup.py xain_fl tests

- name: pylint
run: |
pylint --rcfile=.pylintrc xain_fl tests

- name: mypy
continue-on-error: true
run: |
mypy xain_fl tests

- name: Sphinx check
env:
SPHINXOPTS: "-W"
run: |
cd docs/
make docs

- name: PyTest
run: |
pytest -v
14 changes: 6 additions & 8 deletions .github/workflows/main.yml → .github/workflows/master.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Lint and test
name: Lint and test (master)

on:
pull_request:
Expand All @@ -20,7 +20,7 @@ jobs:
uses: actions/cache@v1
with:
path: ~/.cache/pip
key: pip-${{ hashFiles('setup.py') }}
key: pip-master-${{ hashFiles('setup.py') }}

- name: Install dependencies
run: |
Expand All @@ -30,22 +30,20 @@ jobs:

- name: black
run: |
black --check --exclude "xain_fl/cproto/.*_pb2.*" \
setup.py conftest.py benchmarks examples xain_fl
black --line-length 100 --check setup.py xain_fl tests

- name: isort
run: |
isort --check-only --indent=4 -rc setup.py conftest.py benchmarks \
examples xain_fl
isort --check-only --indent=4 -rc setup.py xain_fl tests

- name: pylint
run: |
pylint --rcfile=pylint.ini benchmarks examples xain_fl
pylint --rcfile=.pylintrc xain_fl tests

- name: mypy
continue-on-error: true
run: |
mypy benchmarks examples/* xain_fl
mypy xain_fl tests

- name: Sphinx check
env:
Expand Down
10 changes: 0 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
# Project specific files and directories
config.cfg
output/*
results

# Pantsbuild
.pants.d
.pants.workdir.file_lock
.pants.workdir.file_lock.lock_message

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
Expand Down
9 changes: 5 additions & 4 deletions .isort.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[settings]
multi_line_output=3
include_trailing_comma=True
force_grid_wrap=0
force_sort_within_sections=True
include_trailing_comma=True
known_third_party=xain_proto,xain_sdk
line_length=100
multi_line_output=3
use_parentheses=True
line_length=88
skip_glob=*_pb2*
19 changes: 19 additions & 0 deletions .pylintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[MESSAGES CONTROL]

disable=bad-continuation,redefined-builtin,duplicate-code,fixme

[TYPECHECK]

# List of members which are set dynamically and missed by pylint inference
# system, and so shouldn't trigger E1101 when accessed. Python regular
# expressions are accepted.
# See: https://github.com/pytorch/pytorch/issues/701#issuecomment-378048755
generated-members=numpy.*,torch.*

# ignore auto generated grpc files
ignore-patterns=

[MISCELLANEOUS]

# List of note tags to take in consideration, separated by a comma.
notes=TODO,FIXME
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ python:
- method: pip
path: .
extra_requirements:
- docs
- docs
Loading