Skip to content

Commit

Permalink
Merge pull request #19 from wtsi-hgi/fix/version-equality
Browse files Browse the repository at this point in the history
Fixes version installation problems and refactors module
  • Loading branch information
jiffyclub authored Jan 31, 2018
2 parents d4d544f + 178b16d commit bcff468
Show file tree
Hide file tree
Showing 28 changed files with 614 additions and 201 deletions.
104 changes: 104 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
# Created by .ignore support plugin (hsz.mobi)
### Python template
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
*.egg-info/
.installed.cfg
*.egg

# 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/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
.hypothesis/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# Jupyter Notebook
.ipynb_checkpoints

# pyenv
.python-version

# celery beat schedule file
celerybeat-schedule

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
### Ansible template
*.retry

9 changes: 4 additions & 5 deletions Dockerfile.test
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,13 @@ RUN apt-get update \
RUN pip install setuptools wheel
RUN pip install ansible==2.3.2.0

ADD tests/requirements.yml /tmp/requirements.yml
ADD tests/integration/requirements.yml /tmp/requirements.yml
RUN ansible-galaxy install -r /tmp/requirements.yml

ADD tests/requirements.txt /tmp/requirements.txt
ADD tests/integration/requirements.txt /tmp/requirements.txt
RUN pip install -r /tmp/requirements.txt

VOLUME "${DATA_DIRECTORY}"
WORKDIR "${DATA_DIRECTORY}"

CMD ansible-galaxy install -r "${DATA_DIRECTORY}/tests/requirements.yml" \
&& pip install -r "${DATA_DIRECTORY}/tests/requirements.txt" \
&& ansible-playbook -vvv -e ansible_python_interpreter=$(which python) -c local "${DATA_DIRECTORY}/tests/site.yml"
CMD "${DATA_DIRECTORY}/run-tests.sh"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Options (= is mandatory):
- extra_args
Extra arguments passed to conda [Default: None]

= name
- name
The name of a Python library to install [Default: None]

- state
Expand Down
Loading

0 comments on commit bcff468

Please sign in to comment.