Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Flatland
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sfwatergit
Flatland
Commits
e3d277b3
Commit
e3d277b3
authored
5 years ago
by
u214892
Browse files
Options
Downloads
Patches
Plain Diff
#97
tox-conda
#94
use miniconda instead of anaconda
parent
14744f8b
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+4
-4
4 additions, 4 deletions
.gitlab-ci.yml
tox.ini
+52
-9
52 additions, 9 deletions
tox.ini
with
56 additions
and
13 deletions
.gitlab-ci.yml
+
4
−
4
View file @
e3d277b3
...
@@ -46,7 +46,7 @@ build_and_deploy_docs:
...
@@ -46,7 +46,7 @@ build_and_deploy_docs:
-
tests
-
tests
before_script
:
before_script
:
-
apt update
-
apt update
-
apt install -y libgl1-mesa-glx xvfb
graphviz
xdg-utils libcairo2-dev libjpeg-dev libgif-dev
-
apt install -y libgl1-mesa-glx xvfb xdg-utils libcairo2-dev libjpeg-dev libgif-dev
-
wget -nv https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O /tmp/Miniconda3-latest-Linux-x86_64.sh
-
wget -nv https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O /tmp/Miniconda3-latest-Linux-x86_64.sh
-
bash /tmp/Miniconda3-latest-Linux-x86_64.sh -b -p /tmp/miniconda3
-
bash /tmp/Miniconda3-latest-Linux-x86_64.sh -b -p /tmp/miniconda3
-
export PATH=/tmp/miniconda3/bin:$PATH
-
export PATH=/tmp/miniconda3/bin:$PATH
...
@@ -72,7 +72,7 @@ benchmarks_and_profiling:
...
@@ -72,7 +72,7 @@ benchmarks_and_profiling:
-
$BENCHMARKS_AND_PROFILING
-
$BENCHMARKS_AND_PROFILING
before_script
:
before_script
:
-
apt update
-
apt update
-
apt install -y libgl1-mesa-glx xvfb
graphviz
xdg-utils libcairo2-dev libjpeg-dev libgif-dev
-
apt install -y libgl1-mesa-glx xvfb xdg-utils libcairo2-dev libjpeg-dev libgif-dev
-
wget -nv https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O /tmp/Miniconda3-latest-Linux-x86_64.sh
-
wget -nv https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O /tmp/Miniconda3-latest-Linux-x86_64.sh
-
bash /tmp/Miniconda3-latest-Linux-x86_64.sh -b -p /tmp/miniconda3
-
bash /tmp/Miniconda3-latest-Linux-x86_64.sh -b -p /tmp/miniconda3
-
export PATH=/tmp/miniconda3/bin:$PATH
-
export PATH=/tmp/miniconda3/bin:$PATH
...
@@ -86,12 +86,12 @@ test_conda_setup:
...
@@ -86,12 +86,12 @@ test_conda_setup:
stage
:
integration_testing
stage
:
integration_testing
before_script
:
before_script
:
-
apt update
-
apt update
-
apt install -y libgl1-mesa-glx xvfb
graphviz
xdg-utils libcairo2-dev libjpeg-dev libgif-dev
-
apt install -y libgl1-mesa-glx xvfb xdg-utils libcairo2-dev libjpeg-dev libgif-dev
-
wget -nv https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O /tmp/Miniconda3-latest-Linux-x86_64.sh
-
wget -nv https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O /tmp/Miniconda3-latest-Linux-x86_64.sh
-
bash /tmp/Miniconda3-latest-Linux-x86_64.sh -b -p /tmp/miniconda3
-
bash /tmp/Miniconda3-latest-Linux-x86_64.sh -b -p /tmp/miniconda3
-
export PATH=/tmp/miniconda3/bin:$PATH
-
conda update -n root conda -y
-
conda update -n root conda -y
script
:
script
:
-
export PATH=/tmp/miniconda3/bin:$PATH
-
bash getting_started/getting_started.sh
-
bash getting_started/getting_started.sh
This diff is collapsed.
Click to expand it.
tox.ini
+
52
−
9
View file @
e3d277b3
[tox]
[tox]
envlist
=
py36, py37, examples, notebooks, flake8
envlist
=
py36, py37, examples, notebooks, flake8, docs, coverage
[travis]
[travis]
python
=
python
=
...
@@ -20,7 +21,12 @@ commands =
...
@@ -20,7 +21,12 @@ commands =
flake8
flatland
tests
examples
benchmarks
flake8
flatland
tests
examples
benchmarks
[testenv:docs]
[testenv:docs]
basepython
=
python
; TODO docs requires make and graphviz installed, therefore exclude Windows
platform
=
linux2
darwin
; use python3.6 because of incompatibility under Windows of the pycairo installed through conda for py37
basepython
=
python3.6
whitelist_externals
=
make
whitelist_externals
=
make
passenv
=
passenv
=
DISPLAY
DISPLAY
...
@@ -30,6 +36,7 @@ conda_deps =
...
@@ -30,6 +36,7 @@ conda_deps =
cairosvg
cairosvg
pycairo
pycairo
tk
tk
graphviz
conda_channels
:
conda_channels
:
conda-forge
conda-forge
anaconda
anaconda
...
@@ -41,7 +48,12 @@ commands =
...
@@ -41,7 +48,12 @@ commands =
make
docs
make
docs
[testenv:coverage]
[testenv:coverage]
basepython
=
python
; TODO coverage requires make, therefore exclude Windows
platform
=
linux2
darwin
; use python3.6 because of incompatibility under Windows of the pycairo installed through conda for py37
basepython
=
python3.6
whitelist_externals
=
make
whitelist_externals
=
make
passenv
=
passenv
=
DISPLAY
DISPLAY
...
@@ -63,7 +75,8 @@ commands =
...
@@ -63,7 +75,8 @@ commands =
make
coverage
make
coverage
[testenv:benchmarks]
[testenv:benchmarks]
basepython
=
python
; use python3.6 because of incompatibility under Windows of the pycairo installed through conda for py37
basepython
=
python3.6
setenv
=
setenv
=
PYTHONPATH
=
{toxinidir}
PYTHONPATH
=
{toxinidir}
passenv
=
passenv
=
...
@@ -81,7 +94,8 @@ commands =
...
@@ -81,7 +94,8 @@ commands =
python
benchmarks/benchmark_all_examples.py
python
benchmarks/benchmark_all_examples.py
[testenv:profiling]
[testenv:profiling]
basepython
=
python
; use python3.6 because of incompatibility under Windows of the pycairo installed through conda for py37
basepython
=
python3.6
setenv
=
setenv
=
PYTHONPATH
=
{toxinidir}
PYTHONPATH
=
{toxinidir}
passenv
=
passenv
=
...
@@ -104,7 +118,8 @@ commands =
...
@@ -104,7 +118,8 @@ commands =
python
benchmarks/profile_all_examples.py
python
benchmarks/profile_all_examples.py
[testenv:examples]
[testenv:examples]
basepython
=
python
; use python3.6 because of incompatibility under Windows of the pycairo installed through conda for py37
basepython
=
python3.6
setenv
=
setenv
=
PYTHONPATH
=
{toxinidir}
PYTHONPATH
=
{toxinidir}
passenv
=
passenv
=
...
@@ -128,7 +143,7 @@ commands =
...
@@ -128,7 +143,7 @@ commands =
python
{toxinidir}/benchmarks/run_all_examples.py
python
{toxinidir}/benchmarks/run_all_examples.py
[testenv:notebooks]
[testenv:notebooks]
basepython
=
python
basepython
=
python
3.6
setenv
=
setenv
=
PYTHONPATH
=
{toxinidir}
PYTHONPATH
=
{toxinidir}
passenv
=
passenv
=
...
@@ -158,7 +173,8 @@ commands =
...
@@ -158,7 +173,8 @@ commands =
python
{toxinidir}/notebooks/run_all_notebooks.py
python
{toxinidir}/notebooks/run_all_notebooks.py
[testenv:start_jupyter]
[testenv:start_jupyter]
basepython
=
python
; use python3.6 because of incompatibility under Windows of the pycairo installed through conda for py37
basepython
=
python3.6
setenv
=
setenv
=
PYTHONPATH
=
{toxinidir}
PYTHONPATH
=
{toxinidir}
passenv
=
passenv
=
...
@@ -187,7 +203,34 @@ commands =
...
@@ -187,7 +203,34 @@ commands =
python
-m
jupyter
notebook
python
-m
jupyter
notebook
[testenv]
[testenv]
whitelist_externals
=
pip
setenv
=
PYTHONPATH
=
{toxinidir}
passenv
=
DISPLAY
XAUTHORITY
; HTTP_PROXY+HTTPS_PROXY required behind corporate proxies
HTTP_PROXY
HTTPS_PROXY
conda_deps
=
cairosvg
pycairo
tk
conda_channels
:
conda-forge
anaconda
deps
=
-r{toxinidir}/requirements_dev.txt
; run tests from subfolder to ensure that resources are accessed via resources and not via relative paths
changedir
=
{envtmpdir}/fefed3ba12bf1ed81dbcc20fb52706ea
commands
=
python
--version
python
-m
pytest
--basetemp
=
{envtmpdir} {toxinidir}
[testenv:py37]
; exclude py37 because of incompatibility under Windows of the pycairo installed through conda for py37
platform
=
linux2
darwin
setenv
=
setenv
=
PYTHONPATH
=
{toxinidir}
PYTHONPATH
=
{toxinidir}
passenv
=
passenv
=
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment