Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .libecl_version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export LIBECL_VERSION=2.4.1
42 changes: 36 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,49 @@ language: python
dist: xenial
matrix:
include:
- python: '2.7'
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why bother with python 2 support?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because we want to ensure similar behavior in Python 2 and 3, and currently there is not a single asset that has a Python 3 compatible FMU pipeline. I think we should remove it as soon as possible, but currently Python 2 support has value...

- python: '3.5'
- python: '3.6'
- python: '3.7'

before_install:
- python3 --version
- python --version
- export INSTALL_DIR=`pwd`/../install
- export PYTHONPATH=$INSTALL_DIR/lib/python$TRAVIS_PYTHON_VERSION/dist-packages:$PYTHONPATH
- export LD_LIBRARY_PATH=$INSTALL_DIR/lib:$INSTALL_DIR/lib64:$LD_LIBRARY_PATH
- echo $INSTALL_DIR
- echo $PYTHONPATH
- echo $LD_LIBRARY_PATH

install:
- python3 -m pip install --upgrade pip
- python3 -m pip install --upgrade -r requirements-dev.txt
- python -m pip install --upgrade pip
- python -m pip install --upgrade -r requirements-dev.txt

script:
- python3 setup.py test
- python3 -m flake8 subscript
before_script:
# For now we have to make install libecl.
# Remove when it's possible to pip install

- source .libecl_version
- git clone https://github.com/equinor/libecl
- pushd libecl
- git fetch
- git checkout tags/$LIBECL_VERSION
- pip install -r requirements.txt
- mkdir build
- pushd build
- cmake .. -DENABLE_PYTHON=ON
-DBUILD_APPLICATIONS=ON
-DCMAKE_INSTALL_PREFIX=$INSTALL_DIR
-DCMAKE_PREFIX_PATH=$INSTALL_DIR
-DINSTALL_ERT_LEGACY=ON
-DCMAKE_C_FLAGS='-Werror=all'
-DCMAKE_CXX_FLAGS='-Werror -Wno-unused-result'
- make
- make install
- popd;popd
- rm -rf libecl
- python -c "import ecl; print(ecl.__file__)"

script:
- python setup.py test
- python -m flake8 subscript
4 changes: 2 additions & 2 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
pandas
scipy
setuptools >=28
setuptools_scm
pytest
pytest-runner
sphinx
click

flake8
2 changes: 2 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
pandas
scipy
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ universal = 1
test = pytest

[flake8]
max-line-length = 79
max-line-length = 88

[tool:pytest]
norecursedirs =
Expand Down
65 changes: 22 additions & 43 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,49 +3,28 @@
import setuptools

setuptools.setup(
name = 'subscript',
description = 'Next-gen resscript',

author = 'Equinor',
author_email = 'pgdr@equinor.com',
url = 'https://github.com/equinor/subscript',

project_urls = {
'Documentation': 'https://subscript.readthedocs.io/',
'Issue Tracker': 'https://github.com/equinor/subscript/issues',
name="subscript",
description="Next-gen resscript",
author="Equinor",
author_email="pgdr@equinor.com",
url="https://github.com/equinor/subscript",
project_urls={
"Documentation": "https://subscript.readthedocs.io/",
"Issue Tracker": "https://github.com/equinor/subscript/issues",
},
keywords = [
],

license = 'Not open source (violating TR1621)',

packages = [
'subscript',
],
platforms = 'any',

install_requires = [
'click',

],

setup_requires = [
'setuptools >=28',
'setuptools_scm',
'pytest-runner'
],

tests_require = [
'pytest',
],

entry_points = {
'console_scripts': [
'subscript = subscript.cli:main',
],
},

use_scm_version = {
'write_to': 'subscript/version.py',
keywords=[],
license="Not open source (violating TR1621)",
packages=["subscript"],
platforms="any",
install_requires=[],
setup_requires=["setuptools >=28", "setuptools_scm", "pytest-runner"],
tests_require=["pytest"],
entry_points={
"console_scripts": [
"subscript = subscript.cli:main",
"presentvalue = subscript.presentvalue:main",
]
},
use_scm_version={"write_to": "subscript/version.py"},
test_suite="subscript/tests",
)
21 changes: 0 additions & 21 deletions subscript/cli.py

This file was deleted.

Loading