Features/cli app

.travis.yml

@@ -10,12 +10,6 @@ env:
     - TOXENV=docs
 matrix:
   include:
-    - python: '2.7'
-      env:
-        - TOXENV=py27-cover,report,coveralls,codecov
-    - python: '2.7'
-      env:
-        - TOXENV=py27-nocov
     - python: '3.4'
       env:
         - TOXENV=py34-cover,report,coveralls,codecov
@@ -44,18 +38,9 @@ matrix:
       sudo: required
       env:
         - TOXENV=py37-nocov
-    - python: 'pypy'
-      env:
-        - TOXENV=pypy-cover,report,coveralls,codecov
-    - python: 'pypy'
-      env:
-        - TOXENV=pypy-nocov
-    - python: 'pypy3'
-      env:
-        - TOXENV=pypy3-cover,report,coveralls,codecov
-    - python: 'pypy3'
-      env:
-        - TOXENV=pypy3-nocov
+  allow_failures:
+    - python: '3.7'
+
 before_install:
   - python --version
   - uname -a
@@ -88,11 +73,11 @@ install:
     fi
     set +x
 script:
-  - tox -v
+  - travis_wait 60 tox -v
 after_failure:
   - more .tox/log/* | cat
   - more .tox/*/log/* | cat
 notifications:
   email:
     on_success: never
-    on_failure: always
+    on_failure: never

appveyor.yml

@@ -11,29 +11,6 @@ environment:
       PYTHON_HOME: C:\Python27
       PYTHON_VERSION: '2.7'
       PYTHON_ARCH: '32'
-    - TOXENV: 'py27-cover,report,codecov'
-      TOXPYTHON: C:\Python27\python.exe
-      PYTHON_HOME: C:\Python27
-      PYTHON_VERSION: '2.7'
-      PYTHON_ARCH: '32'
-    - TOXENV: 'py27-cover,report,codecov'
-      TOXPYTHON: C:\Python27-x64\python.exe
-      WINDOWS_SDK_VERSION: v7.0
-      PYTHON_HOME: C:\Python27-x64
-      PYTHON_VERSION: '2.7'
-      PYTHON_ARCH: '64'
-
-    - TOXENV: 'py27-nocov'
-      TOXPYTHON: C:\Python27\python.exe
-      PYTHON_HOME: C:\Python27
-      PYTHON_VERSION: '2.7'
-      PYTHON_ARCH: '32'
-    - TOXENV: 'py27-nocov'
-      TOXPYTHON: C:\Python27-x64\python.exe
-      WINDOWS_SDK_VERSION: v7.0
-      PYTHON_HOME: C:\Python27-x64
-      PYTHON_VERSION: '2.7'
-      PYTHON_ARCH: '64'
 
     - TOXENV: 'py34-cover,report,codecov'
       TOXPYTHON: C:\Python34\python.exe
@@ -125,6 +102,10 @@ environment:
       PYTHON_VERSION: '3.7'
       PYTHON_ARCH: '64'
 
+matrix:
+  allow_failures:
+    - PYTHON_VERSION: '3.7'
+
 init:
   - ps: echo $env:TOXENV
   - ps: ls C:\Python*

docs/reference/fuchur.scripts.rst

@@ -0,0 +1,62 @@
+fuchur.scripts package
+======================
+
+Submodules
+----------
+
+fuchur.scripts.bus module
+-------------------------
+
+.. automodule:: fuchur.scripts.bus
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+fuchur.scripts.capacity\_factors module
+---------------------------------------
+
+.. automodule:: fuchur.scripts.capacity_factors
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+fuchur.scripts.compute module
+-----------------------------
+
+.. automodule:: fuchur.scripts.compute
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+fuchur.scripts.electricity module
+---------------------------------
+
+.. automodule:: fuchur.scripts.electricity
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+fuchur.scripts.grid module
+--------------------------
+
+.. automodule:: fuchur.scripts.grid
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+fuchur.scripts.heat module
+--------------------------
+
+.. automodule:: fuchur.scripts.heat
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: fuchur.scripts
+    :members:
+    :undoc-members:
+    :show-inheritance:

setup.cfg

@@ -3,7 +3,7 @@ universal = 1
 
 
 [flake8]
-max-line-length = 140
+max-line-length = 79
 exclude = */migrations/*
 
 [tool:pytest]
@@ -31,13 +31,15 @@ addopts =
     --tb=short
 
 [isort]
-force_single_line = True
-line_length = 120
+force_single_line = False
+line_length = 79
 known_first_party = fuchur
 default_section = THIRDPARTY
 forced_separate = test_fuchur
 not_skip = __init__.py
 skip = migrations
+from_first = True
+ignore_whitespace = True
 
 [matrix]
 # This is the configuration for the `./bootstrap.py` script.
@@ -61,13 +63,10 @@ skip = migrations
 #  - can use as many you want
 
 python_versions =
-    py27
     py34
     py35
     py36
     py37
-    pypy
-    pypy3
 
 dependencies =
 #    1.4: Django==1.4.16 !python_versions[py3*]

setup.py

@@ -1,83 +1,88 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import print_function
+from __future__ import absolute_import, print_function
 
+from glob import glob
+from os.path import basename, dirname, join, splitext
 import io
 import re
-from glob import glob
-from os.path import basename
-from os.path import dirname
-from os.path import join
-from os.path import splitext
 
-from setuptools import find_packages
-from setuptools import setup
+from setuptools import find_packages, setup
 
 
 def read(*names, **kwargs):
     with io.open(
         join(dirname(__file__), *names),
-        encoding=kwargs.get('encoding', 'utf8')
+        encoding=kwargs.get("encoding", "utf8"),
     ) as fh:
         return fh.read()
 
 
 setup(
-    name='fuchur',
-    version='0.0.0',
-    license='BSD 3-Clause License',
-    description='An optimizaton model for Europe based on oemof.',
-    long_description='%s\n%s' % (
-        re.compile('^.. start-badges.*^.. end-badges', re.M | re.S).sub('', read('README.rst')),
-        re.sub(':[a-z]+:`~?(.*?)`', r'``\1``', read('CHANGELOG.rst'))
+    name="fuchur",
+    version="0.0.0",
+    license="BSD 3-Clause License",
+    description="An optimizaton model for Europe based on oemof.",
+    long_description="%s\n%s"
+    % (
+        re.compile("^.. start-badges.*^.. end-badges", re.M | re.S).sub(
+            "", read("README.rst")
+        ),
+        re.sub(":[a-z]+:`~?(.*?)`", r"``\1``", read("CHANGELOG.rst")),
     ),
-    author='Simon Hilpert',
-    author_email='[email protected]',
-    url='https://github.com/znes/fuchur',
-    packages=find_packages('src'),
-    package_dir={'': 'src'},
-    py_modules=[splitext(basename(path))[0] for path in glob('src/*.py')],
+    author="Simon Hilpert",
+    author_email="[email protected]",
+    url="https://github.com/znes/fuchur",
+    packages=find_packages("src"),
+    package_dir={"": "src"},
+    py_modules=[splitext(basename(path))[0] for path in glob("src/*.py")],
     include_package_data=True,
     zip_safe=False,
     classifiers=[
-        # complete classifier list: http://pypi.python.org/pypi?%3Aaction=list_classifiers
-        'Development Status :: 1 - Planning',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: BSD License',
-        'Operating System :: Unix',
-        'Operating System :: POSIX',
-        'Operating System :: Microsoft :: Windows',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: Implementation :: CPython',
-        'Programming Language :: Python :: Implementation :: PyPy',
+        # complete classifier list:
+        #
+        #   http://pypi.python.org/pypi?%3Aaction=list_classifiers
+        #
+        "Development Status :: 2 - Pre-Alpha",
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: BSD License",
+        "Operating System :: Unix",
+        "Operating System :: POSIX",
+        "Operating System :: Microsoft :: Windows",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3 :: Only",
+        "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: Implementation :: CPython",
         # uncomment if you test on these interpreters:
         # 'Programming Language :: Python :: Implementation :: IronPython',
         # 'Programming Language :: Python :: Implementation :: Jython',
         # 'Programming Language :: Python :: Implementation :: Stackless',
-        'Topic :: Utilities',
+        "Topic :: Utilities",
     ],
     keywords=[
         # eg: 'keyword1', 'keyword2', 'keyword3',
     ],
     install_requires=[
-        'click',
+        "click",
+        "oemof.tabular==0.0.1.dev0",
+        "setuptools",
         # eg: 'aspectlib==1.1.1', 'six>=1.7',
     ],
     extras_require={
         # eg:
         #   'rst': ['docutils>=0.11'],
         #   ':python_version=="2.6"': ['argparse'],
     },
-    entry_points={
-        'console_scripts': [
-            'fuchur = fuchur.cli:main',
+    dependency_links=(
+        [
+            (
+                "git+https://[email protected]/oemof/oemof-tabular.git"
+                "@features/postprocessing"
+                "#egg=oemof.tabular-0.0.1.dev0"
+            )
         ]
-    },
+    ),
+    entry_points={"console_scripts": ["fuchur = fuchur.cli:main"]},
 )

src/fuchur/__init__.py

@@ -1 +1,22 @@
-__version__ = '0.0.0'
+import os
+
+import pkg_resources as pkg
+import toml
+
+__version__ = "0.0.0"
+__RAW_DATA_PATH__ = os.path.join(os.path.expanduser("~"), "fuchur-raw-data")
+
+if not os.path.exists(__RAW_DATA_PATH__):
+    os.makedirs(__RAW_DATA_PATH__)
+
+scenarios = {
+    scenario["name"]: scenario
+    for resource in pkg.resource_listdir("fuchur", "scenarios")
+    for scenario in [
+        toml.loads(
+            pkg.resource_string(
+                "fuchur", os.path.join("scenarios", resource)
+            ).decode("UTF-8")
+        )
+    ]
+}