Code

Feature/conda based travis ci#294

Code

Closed

boltbeard wants to merge 145 commits intodevopenego/ding0:devfrom feature/conda_based_travis_ciopenego/ding0:feature/conda_based_travis_ciCopy head branch name to clipboard

+2,144-1,447

Commits

Commits on Oct 22, 2018

• Update README.md

  birgits

  authored
  9c76a6f

  Copy full SHA for 9c76a6f

Commits on Nov 5, 2018

• Merge branch 'dev'

  nesnoj

  committed
  7c6e693

  Copy full SHA for 7c6e693

Commits on Mar 18, 2019

• Tests for adding stations (unfinished)

  

  Santiago

  committed
  2747166

  Copy full SHA for 2747166

Commits on Mar 28, 2019

• Tests for adding stations

  

  Santiago

  committed
  a4697f1

  Copy full SHA for a4697f1

• Tests for adding loads, cable distributors (finished)

  Show description for 13291ad
  

  Santiago

  committed
  13291ad

  Copy full SHA for 13291ad

• Tests for build_grid (finished)

  

  Santiago

  committed
  d12fe39

  Copy full SHA for d12fe39

Commits on Mar 29, 2019

• Tests for adding loads

  

  Santiago

  committed
  2a6a710

  Copy full SHA for 2a6a710

• Tests reinforce grid (unfinished)

  

  Santiago

  committed
  1f24140

  Copy full SHA for 1f24140

• Merge branch 'dev' of github.com:openego/ding0 into origin/fix/#86-implement_testing_santiago

  

  Santiago

  committed
  1a72ed4

  Copy full SHA for 1a72ed4

• Correction of tests empty_station, ria_branches

  

  Santiago

  committed
  4c39760

  Copy full SHA for 4c39760

• Corrects Typos

  

  Santiago

  committed
  dd1fd64

  Copy full SHA for dd1fd64

• Corrected test

  

  Santiago

  committed
  47891ee

  Copy full SHA for 47891ee

• Merge branch 'fix/#86-implement_testing' into fix/#86-implement_testing_lvgrid

  

  Santiago

  committed
  a66eb80

  Copy full SHA for a66eb80

Commits on Apr 2, 2019

• Corrected test

  

  Santiago

  committed
  9614ce3

  Copy full SHA for 9614ce3

• Corrected test

  

  Santiago

  committed
  1dc1fcd

  Copy full SHA for 1dc1fcd

• Corrected test

  

  Santiago

  committed
  e812895

  Copy full SHA for e812895

• Cosmetic changes and Docstrings added.

  Show description for b72fc0f
  

  Santiago

  committed
  b72fc0f

  Copy full SHA for b72fc0f

• Cosmetic changes and Docstrings added.

  Show description for a30d5db
  

  Santiago

  committed
  a30d5db

  Copy full SHA for a30d5db

• Correcting build_ria_branches

  

  Santiago

  committed
  615b1ce

  Copy full SHA for 615b1ce

• Correction in build_ria_branches 2

  

  Santiago

  committed
  f3aca2b

  Copy full SHA for f3aca2b

• Corrected Typo

  

  Santiago

  committed
  7e36712

  Copy full SHA for 7e36712

• Correction build_grid_ria

  

  Santiago

  committed
  42d37e4

  Copy full SHA for 42d37e4

• Cosmetic changes and Docstrings added.

  Show description for 536bf83
  

  Santiago

  committed
  536bf83

  Copy full SHA for 536bf83

• Alternative approach to builr_ria_branches with nx.node_degree_xy

  

  Santiago

  committed
  09433f0

  Copy full SHA for 09433f0

• Best version of build_ria_branches

  

  Santiago

  committed
  e17571a

  Copy full SHA for e17571a

Commits on Apr 11, 2019

• Comments erased, Alternative solution for #Nodes adj to LV_station

  

  Santiago

  committed
  300088a

  Copy full SHA for 300088a

Commits on Apr 13, 2019

• Changed travis.yml to use conda instead of virtualenv

  

  Boltbeard

  authored and

  Boltbeard

  committed
  22753df

  Copy full SHA for 22753df

• added conda env yaml file for testing

  

  Boltbeard

  authored and

  Boltbeard

  committed
  13df290

  Copy full SHA for 13df290

• Modified travis to work with newer version of conda

  

  Boltbeard

  authored and

  Boltbeard

  committed
  4675ea8

  Copy full SHA for 4675ea8

• explicitly stating travis shell

  

  Boltbeard

  authored and

  Boltbeard

  committed
  57dcb52

  Copy full SHA for 57dcb52

• Used source activate instead of conda activate to activate the conda environment

  

  Boltbeard

  authored and

  Boltbeard

  committed
  612e69e

  Copy full SHA for 612e69e

• Added lines to list the installed packages through pip and anaconda

  

  Boltbeard

  authored and

  Boltbeard

  committed
  2922103

  Copy full SHA for 2922103

• Bumped the version of shapely to make it compatible with its available package in conda-forge

  

  Boltbeard

  authored and

  Boltbeard

  committed
  24d8ee6

  Copy full SHA for 24d8ee6

• Removed non-ASCII german characters, replaced with ae, oe and ue

  

  Boltbeard

  authored and

  Boltbeard

  committed
  5fb5c41

  Copy full SHA for 5fb5c41

• Replaced more non-ASCII characters

  

  Boltbeard

  authored and

  Boltbeard

  committed
  5f526e6

  Copy full SHA for 5f526e6

• modified syntax for compatibility

  

  Boltbeard

  authored and

  Boltbeard

  committed
  ed715e3

  Copy full SHA for ed715e3

• Removed upper version limits on requirements and ding0_test_env.yml to allow for better testing

  

  Boltbeard

  authored and

  Boltbeard

  committed
  629ad40

  Copy full SHA for 629ad40

• Fixed typo

  

  Boltbeard

  authored and

  Boltbeard

  committed
  88d9ab7

  Copy full SHA for 88d9ab7

• Fixed typo

  

  Boltbeard

  authored and

  Boltbeard

  committed
  caef3b9

  Copy full SHA for caef3b9

• Changed conda command to force install of the correct python version

  

  Boltbeard

  authored and

  Boltbeard

  committed
  62f0329

  Copy full SHA for 62f0329

Commits on Apr 14, 2019

• Ensure conda doesn't downgrade python by pinning python version and freezing installed

  

  Boltbeard

  authored and

  Boltbeard

  committed
  a4ebc74

  Copy full SHA for a4ebc74

• Removed freeze-installed as it wasn't recognized by conda env update

  

  Boltbeard

  authored and

  Boltbeard

  committed
  cc60920

  Copy full SHA for cc60920

• Remove upper limits of pyproj and pandas

  

  Boltbeard

  authored and

  Boltbeard

  committed
  1166da2

  Copy full SHA for 1166da2

Commits on Jun 11, 2019

• Get more info about python and pip instances that are used

  

  Guido Pleßmann

  committed
  2935b43

  Copy full SHA for 2935b43

Commits on Jun 12, 2019

• Revert 'conda activate' to old 'source activate' and more info about python and pip

  

  Guido Pleßmann

  committed
  019c539

  Copy full SHA for 019c539

• Switch to python3 and pip3

  Show description for a1c4b94
  

  Guido Pleßmann

  committed
  a1c4b94

  Copy full SHA for a1c4b94

• Switch back to 'pip' instead of 'pip3'

  Show description for e208f66
  

  Guido Pleßmann

  committed
  e208f66

  Copy full SHA for e208f66

• Explicitly mention pip in conda dependency file

  

  Guido Pleßmann

  committed
  8a516ea

  Copy full SHA for 8a516ea

• Install environment defined in .yml file directly

  

  Guido Pleßmann

  committed
  2c514a9

  Copy full SHA for 2c514a9

• Revert "Install environment defined in .yml file directly"

  Show description for 0b866fc
  

  Guido Pleßmann

  committed
  0b866fc

  Copy full SHA for 0b866fc

• Specify Python version in environment .yml file

  

  Guido Pleßmann

  committed
  2e9c61a

  Copy full SHA for 2e9c61a

• Remove unittest2 dependency

  

  Guido Pleßmann

  committed
  aa2e480

  Copy full SHA for aa2e480

• Remove specification of Python version

  

  Guido Pleßmann

  committed
  5e20189

  Copy full SHA for 5e20189

• Remove commented/unused code

  Show description for 7cd14ad
  

  Guido Pleßmann

  committed
  7cd14ad

  Copy full SHA for 7cd14ad

Commits on Jun 16, 2019

• Tests on windows only

  Show description for de6c9a4
  

  Guido Pleßmann

  committed
  de6c9a4

  Copy full SHA for de6c9a4

Commits on Jun 17, 2019

• Define EGOIOCONFIGDIR for windows OS

  

  Guido Pleßmann

  committed
  b622cbc

  Copy full SHA for b622cbc

• Add semicolon and try to echo envvars

  

  Guido Pleßmann

  committed
  4da1abe

  Copy full SHA for 4da1abe

• Info about env variables

  

  Guido Pleßmann

  committed
  8deee1b

  Copy full SHA for 8deee1b

• Split info about anv vars and change syntax for env vars under windows

  

  Guido Pleßmann

  committed
  72a6ece

  Copy full SHA for 72a6ece

• Comment out new insertation to get "source $MINICONDA..." working

  

  Guido Pleßmann

  committed
  164ede2

  Copy full SHA for 164ede2

• Correct commenting

  

  Guido Pleßmann

  committed
  9768600

  Copy full SHA for 9768600

• Remove echo statement

  

  Guido Pleßmann

  committed
  af93228

  Copy full SHA for af93228

• Roll back last commits

  

  Guido Pleßmann

  committed
  9af162e

  Copy full SHA for 9af162e

• Get information about env vars

  

  Guido Pleßmann

  committed
  6c2be5d

  Copy full SHA for 6c2be5d

• Test routing syntetic grid

  

  Santiago

  committed
  dbb2c0e

  Copy full SHA for dbb2c0e

• Defined empty node_ring to ensure ValueError is thrown instead of UnboundLocalError

  

  Boltbeard

  authored and

  Santiago

  committed
  a05024e

  Copy full SHA for a05024e

• Removed include_root_node from include_satellites under the ring_nodes function in grids.py

  

  Boltbeard

  authored and

  Santiago

  committed
  1b3b4f7

  Copy full SHA for 1b3b4f7

• Replaced pandas indexing with .ix to use .loc[foo, bar] for future compatibility with pandas

  

  Boltbeard

  authored and

  Santiago

  committed
  60d85fc

  Copy full SHA for 60d85fc

• fixed syntax typo

  

  Boltbeard

  authored and

  Santiago

  committed
  fb5d875

  Copy full SHA for fb5d875

• Changes added due to merging of testing branch

  

  Boltbeard

  authored and

  Santiago

  committed
  8b273ff

  Copy full SHA for 8b273ff

• Minor changes

  

  birgits

  authored and

  Santiago

  committed
  d92d121

  Copy full SHA for d92d121

• Updated README.md with the correct travis status badge

  

  boltbeard

  authored and

  Santiago

  committed
  3023950

  Copy full SHA for 3023950

• Fix deprecation warning

  

  birgits

  authored and

  Santiago

  committed
  c7b0729

  Copy full SHA for c7b0729

• Added new .readthedocs.yml v2 for compiliation of docs in python 3.6

  

  Boltbeard

  authored and

  Santiago

  committed
  b45d8a5

  Copy full SHA for b45d8a5

• fixed typo in sphinx configuration in .readthdocs.yml

  

  Boltbeard

  authored and

  Santiago

  committed
  1d765b5

  Copy full SHA for 1d765b5

• fixed index value chosen for extending transformers during reinforcement

  

  Boltbeard

  authored and

  Santiago

  committed
  6032726

  Copy full SHA for 6032726

• Update requirements.txt to use networkx version greater than 2.0

  

  boltbeard

  authored and

  Santiago

  committed
  9a36bc3

  Copy full SHA for 9a36bc3

Commits on Jun 18, 2019

• Try to access windows env vars

  

  Guido Pleßmann

  committed
  a711ec7

  Copy full SHA for a711ec7

• Print env vars and try original windows syntax

  

  Guido Pleßmann

  committed
  a5056eb

  Copy full SHA for a5056eb

• Try USERPROFILE var

  

  Guido Pleßmann

  committed
  d979508

  Copy full SHA for d979508

• Define EGOIOCONFIGDIR for linux and windows

  

  Guido Pleßmann

  committed
  76ebdc4

  Copy full SHA for 76ebdc4

• Add missing semicolons and fix syntax

  

  Guido Pleßmann

  committed
  49039ab

  Copy full SHA for 49039ab

• String concatenation with built-in function

  

  Guido Pleßmann

  committed
  ab83c8d

  Copy full SHA for ab83c8d

Commits on Jul 3, 2019

• Merge branch 'fix/#86-implement_testing_lvgrid' into dev

  Show description for c880920
  

  Santiago

  committed
  c880920

  Copy full SHA for c880920

• Merge branch 'dev' into fix/test_grids

  

  Santiago

  committed
  f850eea

  Copy full SHA for f850eea

• All MV+LV Grid Test Passed, tools updated

  

  Santiago

  committed
  1a2da71

  Copy full SHA for 1a2da71

• Merge branch 'conda_based_travis_ci' into fix/test_grids

  Show description for 6321d62
  

  Santiago

  committed
  6321d62

  Copy full SHA for 6321d62

• Deleted unused importations

  

  Santiago

  committed
  173a530

  Copy full SHA for 173a530

• mv routing commented for debuggin purposes

  

  Santiago

  committed
  e16731a

  Copy full SHA for e16731a

• oedb sessions commented for debuggin purposes

  

  Santiago

  committed
  f37c365

  Copy full SHA for f37c365

• build_lv_grids commented for debuggin purposes

  

  Santiago

  committed
  3a82594

  Copy full SHA for 3a82594

• minimal network test

  

  Santiago

  committed
  ba1d6d8

  Copy full SHA for ba1d6d8

• Replaced travis and requirements from mv routing

  

  Santiago

  committed
  e53a6a3

  Copy full SHA for e53a6a3

• test_construct with travis.yml and requirements from mv_routing

  

  Santiago

  committed
  a758ddb

  Copy full SHA for a758ddb

• Python 3.7 in travis.yml

  

  Santiago

  committed
  7bd79d3

  Copy full SHA for 7bd79d3

• Updated yml file without packages which were'nt originally included in branch mv_routing_test

  

  Santiago

  committed
  13db94d

  Copy full SHA for 13db94d

• Merge remote-tracking branch 'origin/fix/test_grids' into fix/test_grids

  

  Santiago

  committed
  42108c7

  Copy full SHA for 42108c7

• Updated yml file without packages which were'nt originally included in branch mv_routing_test

  

  Santiago

  committed
  e226fab

  Copy full SHA for e226fab

Commits on Jul 8, 2019

• String concatenation without concat()

  

  Guido Pleßmann

  committed
  55d7ea5

  Copy full SHA for 55d7ea5

Commits on Jul 10, 2019

• test_construct with dict-like approach

  

  Santiago

  committed
  ad24e20

  Copy full SHA for ad24e20

• All test passed, travis.yml from fix/#86-implement_testing_lvgrid

  

  Santiago

  committed
  3a3808d

  Copy full SHA for 3a3808d

• Erased all test from cable distributors

  

  Santiago

  committed
  b540569

  Copy full SHA for b540569

• Changed set() for all() assertions for Python 3.4 and 3.5 compatibility

  

  Santiago

  committed
  a9486c8

  Copy full SHA for a9486c8

• Modification test_local_routing disregarding order of the tuples with filter and boolean list

  

  Santiago

  committed
  1b52c55

  Copy full SHA for 1b52c55

Commits on Jul 12, 2019

• Add other Python versions and linux OS

  

  Guido Pleßmann

  committed
  b74a041

  Copy full SHA for b74a041

• Use $HOME to concat egoio config dir for linux

  

  Guido Pleßmann

  committed
  4b26a55

  Copy full SHA for 4b26a55

Commits on Jul 15, 2019

• Clean-up travis config file

  

  Guido Pleßmann

  committed
  c7ab7f5

  Copy full SHA for c7ab7f5

• Tell about travis ci testing service that is used

  

  Guido Pleßmann

  committed
  93e3c70

  Copy full SHA for 93e3c70

• Update what's new

  

  Guido Pleßmann

  committed
  0f9c76c

  Copy full SHA for 0f9c76c

Commits on Jul 16, 2019

• Update docs about installation

  

  Guido Pleßmann

  committed
  b364b25

  Copy full SHA for b364b25

• Fixed syntax error

  

  Santiago

  committed
  066aaee

  Copy full SHA for 066aaee

• COmpatibility issue networkx 1.1 vs 2.0 fixed

  

  Santiago

  committed
  52f9461

  Copy full SHA for 52f9461

• Fix conda create ENV command

  

  Guido Pleßmann

  committed
  dbbc553

  Copy full SHA for dbbc553

• Change 0 to False in Tests for Python 3.5 and 3.6

  

  Santiago

  committed
  a71e7a5

  Copy full SHA for a71e7a5

• Filter non True values (should be 0)

  

  Santiago

  committed
  c100c9c

  Copy full SHA for c100c9c

Commits on Jul 18, 2019

• test_construct changed to disregard names of cable distributors

  

  Santiago

  committed
  498d7bf

  Copy full SHA for 498d7bf

• Tuple-set search in test_local_routing ignoring order

  Show description for 896b023
  

  Santiago

  committed
  896b023

  Copy full SHA for 896b023

• fixed rqrm.txt

  

  Santiago

  committed
  0a3dac1

  Copy full SHA for 0a3dac1

• whats new..

  

  Santiago

  committed
  4feba4b

  Copy full SHA for 4feba4b

Commits on Jul 19, 2019

• Merge branch 'fix/test_grids' into feature/conda_based_travis_ci

  

  Guido Pleßmann

  committed
  57ec785

  Copy full SHA for 57ec785

• Include version limits in conda env yaml

  

  Guido Pleßmann

  committed
  76ec7d7

  Copy full SHA for 76ec7d7

• Remove upper version limit for matplotlib to resolve conflicts with conda

  

  Guido Pleßmann

  committed
  d3c1940

  Copy full SHA for d3c1940

• Remove unittest2 from requirements.txt for using conda on Travis CI

  

  Guido Pleßmann

  committed
  8a720df

  Copy full SHA for 8a720df

• Get more information about pip and python versions

  

  Guido Pleßmann

  committed
  5a20e44

  Copy full SHA for 5a20e44

• Split env creation and package installation

  

  Guido Pleßmann

  committed
  8a6cd6d

  Copy full SHA for 8a6cd6d

• Use "conda create"

  

  Guido Pleßmann

  committed
  f1acad9

  Copy full SHA for f1acad9

• Less restrictive version specifications for enabling Python 3.7

  

  Guido Pleßmann

  committed
  a4e1708

  Copy full SHA for a4e1708

• Remove last version restriction from .yml

  

  Guido Pleßmann

  committed
  3fa50b9

  Copy full SHA for 3fa50b9

• Relaxing pyproj version limit

  

  Guido Pleßmann

  committed
  d4c144b

  Copy full SHA for d4c144b

• pyproj limited to 1.9.6

  

  Guido Pleßmann

  committed
  b48ca2c

  Copy full SHA for b48ca2c

• Using "conda env" for windows

  

  Guido Pleßmann

  committed
  dbb9987

  Copy full SHA for dbb9987

• Fix syntax

  

  Guido Pleßmann

  committed
  b550389

  Copy full SHA for b550389

• Install conda package on create for windows

  

  Guido Pleßmann

  committed
  4e7c6c9

  Copy full SHA for 4e7c6c9

• Fix double name of env

  

  Guido Pleßmann

  committed
  598ea9a

  Copy full SHA for 598ea9a

• Use alternativ conda calls

  

  Guido Pleßmann

  committed
  9e62130

  Copy full SHA for 9e62130

• Add env name again

  

  Guido Pleßmann

  committed
  27dd86f

  Copy full SHA for 27dd86f

• Use conda env create for linux

  

  Guido Pleßmann

  committed
  e425fd6

  Copy full SHA for e425fd6

Commits on Jul 31, 2019

• Adding pytest to pip install list (in conda dependency .yml)

  

  Guido Pleßmann

  committed
  e23fdbb

  Copy full SHA for e23fdbb

• Exclude tests on Windows

  

  Guido Pleßmann

  committed
  daed128

  Copy full SHA for daed128

• Do not install pytest from conda, but instead from pip

  

  Guido Pleßmann

  committed
  85d73f1

  Copy full SHA for 85d73f1

• Call installation of pytest direct in travis.yml

  

  Guido Pleßmann

  committed
  f4c9df0

  Copy full SHA for f4c9df0

Commits on Aug 1, 2019

• Fix indentation

  

  Guido Pleßmann

  committed
  5b96718

  Copy full SHA for 5b96718

• Align dependencies versions in ding0_env.yml and requirements.txt

  

  Guido Pleßmann

  committed
  52f2b01

  Copy full SHA for 52f2b01

• Try test under windows on Travis CI (once again....)

  

  Guido Pleßmann

  committed
  855cd51

  Copy full SHA for 855cd51

• Revert "Try test under windows on Travis CI (once again....)"

  Show description for 2a05c20
  

  Guido Pleßmann

  committed
  2a05c20

  Copy full SHA for 2a05c20