Skip to content

maintenance: updates vulnerable requirements and minor doc #1320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 2, 2020
Merged
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
Empty file removed .gitmodules
Empty file.
13 changes: 8 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@
[![travis-ci]](https://travis-ci.org/ITISFoundation/osparc-simcore "State of CI: build, test and pushing images")
[![coverals.io]](https://coveralls.io/github/ITISFoundation/osparc-simcore?branch=master "Test coverage")
[![github.io]](https://itisfoundation.github.io/)
[![itis.dockerhub]](https://hub.docker.com/u/itisfoundation)


[![itis.dockerhub]](https://hub.docker.com/u/itisfoundation)
<!-- THIS SERVICE MALFUNCTIONS
[![webserver]](https://microbadger.com/images/itisfoundation/webserver "More on itisfoundation/webserver:staging-latest image")
[![director]](https://microbadger.com/images/itisfoundation/director "More on itisfoundation/director:staging-latest image")
[![sidecar]](https://microbadger.com/images/itisfoundation/sidecar "More on itisfoundation/sidecar:staging-latest image")
[![storage]](https://microbadger.com/images/itisfoundation/storage "More on itisfoundation/storage:staging-latest image")
-->

<!-- ADD HERE ALL BADGE URLS -->
[Requires.io]:https://img.shields.io/requires/github/ITISFoundation/osparc-simcore.svg
Expand Down Expand Up @@ -72,15 +74,16 @@ To build and run:
To develop, in addition:

- python 3.6 (this dependency will be deprecated soon)
- nodejs for client part (this dependency will be deprecated soon)
- [vscode] (highly recommended)

This project works and is developed mainly under **linux** but, with some adjustments, it can also be done under windows (see notes below).

### Developing in **Windows**
##### Setup for **windows**

In windows, it works under [WSL] (windows subsystem for linux).
It is also highly recommended using [chocolatey] as packages manager.
In windows, it works under [WSL] (windows subsystem for linux). Some details on the setup:

- [Install](https://chocolatey.org/docs/installation) chocolatey
- [Install](https://chocolatey.org/docs/installation) [chocolatey] package manager
- ``choco install docker-for-windows``
- ``choco install wsl`` or using [instructions](https://docs.microsoft.com/en-us/windows/wsl/install-win10)
- Follow **all details** on [how to setup flawlessly](https://nickjanetakis.com/blog/setting-up-docker-for-windows-and-wsl-to-work-flawlessly) docker for windows and [WSL]
Expand Down
1 change: 1 addition & 0 deletions packages/simcore-sdk/requirements/_base.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#
# Specifies third-party dependencies for 'simcore-sdk'
#
pyyaml >=5.3 # Vulnerability

aiohttp
networkx
Expand Down
4 changes: 2 additions & 2 deletions packages/simcore-sdk/requirements/_base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile
# To update, run:
#
# make _base.txt
# pip-compile --output-file=_base.txt _base.in
#
aiofiles==0.4.0
aiohttp==3.6.2
Expand All @@ -16,7 +16,7 @@ multidict==4.5.2 # via aiohttp, yarl
networkx==2.3
pika==1.0.1
psycopg2-binary==2.8.4
pyyaml==5.1 # via trafaret-config
pyyaml==5.3
six==1.12.0 # via tenacity
sqlalchemy==1.3.3
tenacity==6.0.0
Expand Down
4 changes: 2 additions & 2 deletions packages/simcore-sdk/requirements/_test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ pytest-mock==2.0.0
pytest-runner==5.2
pytest-sugar==0.9.2
pytest==5.3.2
pyyaml==5.1
pyyaml==5.3
requests==2.22.0
six==1.12.0
sqlalchemy==1.3.3
tenacity==5.0.4
tenacity==6.0.0
termcolor==1.1.0 # via pytest-sugar
trafaret-config==2.0.2
trafaret==1.2.0
Expand Down