Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Update dependencies #18

Merged
merged 3 commits into from
Oct 25, 2019
Merged

Update dependencies #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29a4cec
Update dependencies
jayrbolton Oct 25, 2019
bb65ab9
Run autopep8 on everything; flake8 fixes everywhere; create "make tes…
jayrbolton Oct 25, 2019
bc494fa
Add note about running arango with docker-compose
jayrbolton Oct 25, 2019
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
4 changes: 4 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.PHONY: test

test:
pipenv run sh scripts/run_tests.sh
10 changes: 5 additions & 5 deletions Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ verify_ssl = true
[dev-packages]

[packages]
requests = "==2.19.1"
biopython = "==1.72"
requests = "==2.22.0"
biopython = "==1.74"
parsec = "==3.3"
networkx = "==2.3"
pytest = "*"
python-arango = "==4.4.0"
networkx = "==2.4"
pytest = "==5.2.2"
python-arango = "==5.2.1"

[requires]
python_version = "3.7"
147 changes: 79 additions & 68 deletions Pipfile.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 8 additions & 11 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,22 @@ Build status (master):

## Setup

For Ubuntu (and possibly other distributions) ensure that the appropriate `python-dev` package
is installed, e.g. `sudo apt install python3.7-dev`.
Install Python 3.7, preferably using pyenv: https://github.com/pyenv/pyenv

With [pipenv](https://github.com/pypa/pipenv) installed, run:
Then install [pipenv](https://github.com/pypa/pipenv) and run:

```sh
pipenv install
```

Alternatively, you can use [pyenv](https://github.com/pyenv/pyenv) to manage your python
installations.

## Running tests

To run tests, arangodb must be running locally on the default port with default root credentials.
To run tests, arangodb must be running locally on the default port with default root credentials. You can run arangodb using docker-compose with `docker-compse up`.

Then from the repository root:
```
$ pipenv shell
$ export PYTHONPATH=$(pwd):$(pwd)/src/; pytest

```sh
make test
```

## Standard loader usage
Expand Down Expand Up @@ -211,4 +208,4 @@ one-off scripts there.
* Merge edges are never expired.
* Currently only handles merge edges where
* The merged node was present in the prior load and
* The target node is present in the current load.
* The target node is present in the current load.
12 changes: 12 additions & 0 deletions docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
version: '3'

# This docker-compose is for developer convenience, not for running in production.

services:

# Arangodb server in cluster mode
arangodb:
image: arangodb:3.5
ports:
- "127.0.0.1:8529:8529"
command: sh -c "arangodb --starter.local"
Loading