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.

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

Feature/conda based travis ci #294

Closed
wants to merge 145 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
145 commits
Select commit Hold shift + click to select a range
9c76a6f
Update README.md
birgits Oct 22, 2018
7c6e693
Merge branch 'dev'
nesnoj Nov 5, 2018
2747166
Tests for adding stations (unfinished)
Mar 18, 2019
a4697f1
Tests for adding stations
Mar 28, 2019
13291ad
Tests for adding loads, cable distributors (finished)
Mar 28, 2019
d12fe39
Tests for build_grid (finished)
Mar 28, 2019
2a6a710
Tests for adding loads
Mar 29, 2019
1f24140
Tests reinforce grid (unfinished)
Mar 29, 2019
1a72ed4
Merge branch 'dev' of github.com:openego/ding0 into origin/fix/#86-im…
Mar 29, 2019
4c39760
Correction of tests empty_station, ria_branches
Mar 29, 2019
dd1fd64
Corrects Typos
Mar 29, 2019
47891ee
Corrected test
Mar 29, 2019
a66eb80
Merge branch 'fix/#86-implement_testing' into fix/#86-implement_testi…
Mar 29, 2019
9614ce3
Corrected test
Apr 2, 2019
1dc1fcd
Corrected test
Apr 2, 2019
e812895
Corrected test
Apr 2, 2019
b72fc0f
Cosmetic changes and Docstrings added.
Apr 2, 2019
a30d5db
Cosmetic changes and Docstrings added.
Apr 2, 2019
615b1ce
Correcting build_ria_branches
Apr 2, 2019
f3aca2b
Correction in build_ria_branches 2
Apr 2, 2019
7e36712
Corrected Typo
Apr 2, 2019
42d37e4
Correction build_grid_ria
Apr 2, 2019
536bf83
Cosmetic changes and Docstrings added.
Apr 2, 2019
09433f0
Alternative approach to builr_ria_branches with nx.node_degree_xy
Apr 2, 2019
e17571a
Best version of build_ria_branches
Apr 2, 2019
300088a
Comments erased, Alternative solution for #Nodes adj to LV_station
Apr 11, 2019
22753df
Changed travis.yml to use conda instead of virtualenv
Apr 13, 2019
13df290
added conda env yaml file for testing
Apr 13, 2019
4675ea8
Modified travis to work with newer version of conda
Apr 13, 2019
57dcb52
explicitly stating travis shell
Apr 13, 2019
612e69e
Used source activate instead of conda activate to activate the conda …
Apr 13, 2019
2922103
Added lines to list the installed packages through pip and anaconda
Apr 13, 2019
24d8ee6
Bumped the version of shapely to make it compatible with its availabl…
Apr 13, 2019
5fb5c41
Removed non-ASCII german characters, replaced with ae, oe and ue
Apr 13, 2019
5f526e6
Replaced more non-ASCII characters
Apr 13, 2019
ed715e3
modified syntax for compatibility
Apr 13, 2019
629ad40
Removed upper version limits on requirements and ding0_test_env.yml t…
Apr 13, 2019
88d9ab7
Fixed typo
Apr 13, 2019
caef3b9
Fixed typo
Apr 13, 2019
62f0329
Changed conda command to force install of the correct python version
Apr 13, 2019
a4ebc74
Ensure conda doesn't downgrade python by pinning python version and f…
Apr 14, 2019
cc60920
Removed freeze-installed as it wasn't recognized by conda env update
Apr 14, 2019
1166da2
Remove upper limits of pyproj and pandas
Apr 14, 2019
2935b43
Get more info about python and pip instances that are used
Jun 11, 2019
019c539
Revert 'conda activate' to old 'source activate' and more info about …
Jun 12, 2019
a1c4b94
Switch to python3 and pip3
Jun 12, 2019
e208f66
Switch back to 'pip' instead of 'pip3'
Jun 12, 2019
8a516ea
Explicitly mention pip in conda dependency file
Jun 12, 2019
2c514a9
Install environment defined in .yml file directly
Jun 12, 2019
0b866fc
Revert "Install environment defined in .yml file directly"
Jun 12, 2019
2e9c61a
Specify Python version in environment .yml file
Jun 12, 2019
aa2e480
Remove unittest2 dependency
Jun 12, 2019
5e20189
Remove specification of Python version
Jun 12, 2019
7cd14ad
Remove commented/unused code
Jun 12, 2019
de6c9a4
Tests on windows only
Jun 16, 2019
b622cbc
Define EGOIOCONFIGDIR for windows OS
Jun 17, 2019
4da1abe
Add semicolon and try to echo envvars
Jun 17, 2019
8deee1b
Info about env variables
Jun 17, 2019
72a6ece
Split info about anv vars and change syntax for env vars under windows
Jun 17, 2019
164ede2
Comment out new insertation to get "source $MINICONDA..." working
Jun 17, 2019
9768600
Correct commenting
Jun 17, 2019
af93228
Remove echo statement
Jun 17, 2019
9af162e
Roll back last commits
Jun 17, 2019
6c2be5d
Get information about env vars
Jun 17, 2019
dbb2c0e
Test routing syntetic grid
Jun 17, 2019
a05024e
Defined empty node_ring to ensure ValueError is thrown instead of Unb…
Mar 6, 2019
1b3b4f7
Removed include_root_node from include_satellites under the ring_node…
Mar 6, 2019
60d85fc
Replaced pandas indexing with .ix to use .loc[foo, bar] for future co…
Mar 6, 2019
fb5d875
fixed syntax typo
Mar 7, 2019
8b273ff
Changes added due to merging of testing branch
Mar 26, 2019
d92d121
Minor changes
birgits Apr 3, 2019
3023950
Updated README.md with the correct travis status badge
boltbeard Apr 3, 2019
c7b0729
Fix deprecation warning
birgits Apr 3, 2019
b45d8a5
Added new .readthedocs.yml v2 for compiliation of docs in python 3.6
Apr 3, 2019
1d765b5
fixed typo in sphinx configuration in .readthdocs.yml
Apr 3, 2019
6032726
fixed index value chosen for extending transformers during reinforcement
Apr 5, 2019
9a36bc3
Update requirements.txt to use networkx version greater than 2.0
boltbeard Apr 11, 2019
a711ec7
Try to access windows env vars
Jun 18, 2019
a5056eb
Print env vars and try original windows syntax
Jun 18, 2019
d979508
Try USERPROFILE var
Jun 18, 2019
76ebdc4
Define EGOIOCONFIGDIR for linux and windows
Jun 18, 2019
49039ab
Add missing semicolons and fix syntax
Jun 18, 2019
ab83c8d
String concatenation with built-in function
Jun 18, 2019
c880920
Merge branch 'fix/#86-implement_testing_lvgrid' into dev
Jul 3, 2019
f850eea
Merge branch 'dev' into fix/test_grids
Jul 3, 2019
1a2da71
All MV+LV Grid Test Passed, tools updated
Jul 3, 2019
6321d62
Merge branch 'conda_based_travis_ci' into fix/test_grids
Jul 3, 2019
173a530
Deleted unused importations
Jul 3, 2019
e16731a
mv routing commented for debuggin purposes
Jul 3, 2019
f37c365
oedb sessions commented for debuggin purposes
Jul 3, 2019
3a82594
build_lv_grids commented for debuggin purposes
Jul 3, 2019
ba1d6d8
minimal network test
Jul 3, 2019
e53a6a3
Replaced travis and requirements from mv routing
Jul 3, 2019
a758ddb
test_construct with travis.yml and requirements from mv_routing
Jul 3, 2019
7bd79d3
Python 3.7 in travis.yml
Jul 3, 2019
13db94d
Updated yml file without packages which were'nt originally included i…
Jul 3, 2019
42108c7
Merge remote-tracking branch 'origin/fix/test_grids' into fix/test_grids
Jul 3, 2019
e226fab
Updated yml file without packages which were'nt originally included i…
Jul 3, 2019
55d7ea5
String concatenation without concat()
Jul 8, 2019
ad24e20
test_construct with dict-like approach
Jul 10, 2019
3a3808d
All test passed, travis.yml from fix/#86-implement_testing_lvgrid
Jul 10, 2019
b540569
Erased all test from cable distributors
Jul 10, 2019
a9486c8
Changed set() for all() assertions for Python 3.4 and 3.5 compatibility
Jul 10, 2019
1b52c55
Modification test_local_routing disregarding order of the tuples with…
Jul 10, 2019
b74a041
Add other Python versions and linux OS
Jul 12, 2019
4b26a55
Use $HOME to concat egoio config dir for linux
Jul 12, 2019
c7ab7f5
Clean-up travis config file
Jul 15, 2019
93e3c70
Tell about travis ci testing service that is used
Jul 15, 2019
0f9c76c
Update what's new
Jul 15, 2019
b364b25
Update docs about installation
Jul 16, 2019
066aaee
Fixed syntax error
Jul 16, 2019
52f9461
COmpatibility issue networkx 1.1 vs 2.0 fixed
Jul 16, 2019
dbbc553
Fix conda create ENV command
Jul 16, 2019
a71e7a5
Change 0 to False in Tests for Python 3.5 and 3.6
Jul 16, 2019
c100c9c
Filter non True values (should be 0)
Jul 16, 2019
498d7bf
test_construct changed to disregard names of cable distributors
Jul 18, 2019
896b023
Tuple-set search in test_local_routing ignoring order
Jul 18, 2019
0a3dac1
fixed rqrm.txt
Jul 18, 2019
4feba4b
whats new..
Jul 18, 2019
57ec785
Merge branch 'fix/test_grids' into feature/conda_based_travis_ci
Jul 19, 2019
76ec7d7
Include version limits in conda env yaml
Jul 19, 2019
d3c1940
Remove upper version limit for matplotlib to resolve conflicts with c…
Jul 19, 2019
8a720df
Remove unittest2 from requirements.txt for using conda on Travis CI
Jul 19, 2019
5a20e44
Get more information about pip and python versions
Jul 19, 2019
8a6cd6d
Split env creation and package installation
Jul 19, 2019
f1acad9
Use "conda create"
Jul 19, 2019
a4e1708
Less restrictive version specifications for enabling Python 3.7
Jul 19, 2019
3fa50b9
Remove last version restriction from .yml
Jul 19, 2019
d4c144b
Relaxing pyproj version limit
Jul 19, 2019
b48ca2c
pyproj limited to 1.9.6
Jul 19, 2019
dbb9987
Using "conda env" for windows
Jul 19, 2019
b550389
Fix syntax
Jul 19, 2019
4e7c6c9
Install conda package on create for windows
Jul 19, 2019
598ea9a
Fix double name of env
Jul 19, 2019
9e62130
Use alternativ conda calls
Jul 19, 2019
27dd86f
Add env name again
Jul 19, 2019
e425fd6
Use conda env create for linux
Jul 19, 2019
e23fdbb
Adding pytest to pip install list (in conda dependency .yml)
Jul 31, 2019
daed128
Exclude tests on Windows
Jul 31, 2019
85d73f1
Do not install pytest from conda, but instead from pip
Jul 31, 2019
f4c9df0
Call installation of pytest direct in travis.yml
Jul 31, 2019
5b96718
Fix indentation
Aug 1, 2019
52f2b01
Align dependencies versions in ding0_env.yml and requirements.txt
Aug 1, 2019
855cd51
Try test under windows on Travis CI (once again....)
Aug 1, 2019
2a05c20
Revert "Try test under windows on Travis CI (once again....)"
Aug 1, 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
87 changes: 76 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,81 @@
language: python
python:
- "3.4"
- "3.5"
- "3.6"
# - "3.7"
# command to install dependencies
# Thanks to @kangwonlee for showing how to test on travis with windows using conda
# https://github.com/kangwonlee/travis-yml-conda-posix-nt/blob/master/.travis.yml


language : shell

env:
- CONDA_PYTHON=3.4
- CONDA_PYTHON=3.5
- CONDA_PYTHON=3.6
- CONDA_PYTHON=3.7

os:
# - windows
- linux

before_install:
# set conda path info
- if [[ "$TRAVIS_OS_NAME" != "windows" ]]; then
MINICONDA_PATH=$HOME/miniconda;
MINICONDA_SUB_PATH=$MINICONDA_PATH/bin;
EGOIOCONFIGDIR=$HOME/.egoio;
elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
MINICONDA_PATH=/c/tools/miniconda3/;
MINICONDA_PATH_WIN=`cygpath --windows $MINICONDA_PATH`;
MINICONDA_SUB_PATH=$MINICONDA_PATH/Scripts;
EGOIOCONFIGDIR=$USERPROFILE/.egoio;
fi;

# obtain miniconda installer
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh;
fi;
- echo "$MINICONDA_PATH"; echo "$MINICONDA_SUB_PATH";

install:
- EGOIOCONFIGDIR=`python -c "import os; print(os.path.join(os.path.expanduser(\"~\"), \".egoio\"))"`
# install miniconda
# pip and conda will also need OpenSSL for Windows
- if [[ "$TRAVIS_OS_NAME" != "windows" ]]; then
bash miniconda.sh -b -p $HOME/miniconda;
elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
choco install openssl.light;
choco install miniconda3 --params="'/AddToPath:1 /D:$MINICONDA_PATH_WIN'";
fi;
- export PATH="$MINICONDA_PATH:$MINICONDA_SUB_PATH:$PATH";

# for conda version 4.4 or later
- source $MINICONDA_PATH/etc/profile.d/conda.sh;
- hash -r;
- conda config --set always_yes yes --set changeps1 no;
- conda update -q conda;
- activate
- conda info --all
- echo "Python $CONDA_PYTHON running on $TRAVIS_OS_NAME";
- if [[ "$TRAVIS_OS_NAME" != "windows" ]]; then
conda env create --name ding0_env python=$CONDA_PYTHON --file=ding0_env.yml;
elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
conda env create --name ding0_env python=$CONDA_PYTHON;
conda env update --name ding0_env --file=ding0_env.yml;
fi;
- which pip; which python; pip -V; python -V; which pip3; which python3;
#- conda activate test-environment;
# - source activate ding0_env
- activate ding0_env
- which pip; which python; pip -V; python -V; which pip3; which python3;

# Create config file for database access
- mkdir $EGOIOCONFIGDIR
- printf '%s\n' '[oedb]' 'dialect = oedialect' 'host = openenergy-platform.org' 'port = 443' 'database = oedb' 'username = Ding0_test_user' 'password = 659193bb5925d401943e4f77d4bac7479bcd9214'> $EGOIOCONFIGDIR/config.ini
- cat $EGOIOCONFIGDIR/config.ini
- pip install -r requirements.txt
# command to run tests
- pip install --no-cache-dir .
- pip install pytest

# List installed packages for debugging
- conda list
- pip list

script:
- pytest -vv
pytest -vv
21 changes: 0 additions & 21 deletions check_ding0_installation.sh

This file was deleted.

2 changes: 1 addition & 1 deletion ding0/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def adapt_numpy_int64(numpy_int64):

Parameters
----------
numpy_int64 : :obj:`int`
numpy_int64 : int
numpty 64bits integer.

Returns
Expand Down
Loading