Skip to content

Commit

Permalink
Merge pull request #1073 from oemof/fix/#1072-merge-and-clean-configu…
Browse files Browse the repository at this point in the history
…ration-files

Merge configurations into `pyproject.toml`
  • Loading branch information
p-snft committed May 31, 2024
2 parents b35efad + 478fa16 commit 2cba242
Show file tree
Hide file tree
Showing 10 changed files with 142 additions and 280 deletions.
20 changes: 0 additions & 20 deletions .bumpversion.cfg

This file was deleted.

4 changes: 4 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[flake8]
max-line-length = 79
exclude = */migrations/*, docs/conf.py
ignore = E203, W503
7 changes: 0 additions & 7 deletions .prospector.yml

This file was deleted.

26 changes: 0 additions & 26 deletions MANIFEST.in

This file was deleted.

1 change: 0 additions & 1 deletion VERSION

This file was deleted.

5 changes: 4 additions & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
import matplotlib
from sphinx.ext.autodoc import between

from oemof.solph import __version__


matplotlib.use("agg")
sys.path.append(os.path.join(os.path.dirname(__file__), "..", "examples"))

Expand Down Expand Up @@ -36,7 +39,7 @@ def setup(app):
year = "2014-2023"
author = "oemof-developer-group"
copyright = "{0}, {1}".format(year, author)
version = release = "0.5.3a1"
version = release = __version__

pygments_style = "trac"
templates_path = ["."]
Expand Down
135 changes: 132 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,94 @@
[build-system]
requires = ["flit_core >=3.2,<4"]
build-backend = "flit_core.buildapi"

[tool.flit.sdist]
include = [
"AUTHORS.rst",
"CITATION.cff",
"CODE_OF_CONDUCT.md",
"CONTRIBUTING.rst",
"LICENSE",
"README.rst",
"VERSION",
"tox.ini",
"ci/",
"docs/",
"examples/",
"src/",
"tests/",
".bumpversion.cfg",
".coveragerc",
".editorconfig",
".flake8",
".pep8speaks.yml",
".readthedocs.yaml",
".scrutinizer.yml",
]
exclude = ["docs/_build"]

[project]
name = "oemof.solph"
dynamic = ["version"]
description = "A model generator for energy system modelling and optimisation."
readme = "README.rst"
authors = [
{name = "oemof developer group", email = "contact@oemof.org"},
]
classifiers = [
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
"Intended Audience :: Science/Research",
"License :: OSI Approved :: MIT License",
"Operating System :: Unix",
"Operating System :: POSIX",
"Operating System :: Microsoft :: Windows",
"Operating System :: MacOS",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: Implementation :: CPython",
"Topic :: Utilities",
]
requires-python = ">=3.8"
dependencies = [
"blinker",
"dill",
"numpy",
"pandas >= 1.5.3",
"pyomo >= 6.6.0, < 7.0",
"networkx",
"oemof.tools >= 0.4.3",
"oemof.network >= 0.5.0",
]
license = {text = "MIT"}

[project.urls]
Homepage = "https://github.com/oemof/oemof-solph"
Documentation = "https://oemof-solph.readthedocs.io/"
Changelog = "https://oemof-solph.readthedocs.io/en/latest/changelog.html"
"Issue Tracker" = "https://github.com/oemof/oemof-solph/issues/"

[project.optional-dependencies]
dev = [
"flit",
"matplotlib",
"nbformat",
"pytest",
"sphinx",
"sphinx_rtd_theme",
"sphinx-copybutton",
"sphinx-design",
"termcolor",
"tox",
]

[project.scripts]
oemof_installation_test = "oemof.solph._console_scripts:check_oemof_installation"

[tool.black]
line-length = 79
target-version = ['py39', 'py310', 'py311']
Expand All @@ -18,6 +109,44 @@ exclude = '''
)/
'''

[build-system]
requires = ["setuptools", "wheel"]
build-backend = "setuptools.build_meta"
[tool.pytest.ini_options]
norecursedirs = [
".git",
".tox",
".env",
"dist",
"build",
"migrations",
"examples",
]
python_files = [
"test_*.py",
"*_test.py",
"*_tests.py",
"tests.py",
]
addopts = """
-ra
--strict-markers
--ignore=docs/conf.py
--ignore=setup.py
--ignore=ci
--ignore=.eggs
--doctest-modules
--doctest-glob=\\*.rst
--tb=short
--pyargs
"""
testpaths = [
"src/oemof/solph/",
"tests/",
"docs/",
]

[tool.isort]
force_single_line = true
line_length = 79
known_first_party = "oemof-solph"
default_section = "THIRDPARTY"
forced_separate = "test_oemof-solph"
skip = "migrations"
112 changes: 0 additions & 112 deletions setup.cfg

This file was deleted.

Loading

0 comments on commit 2cba242

Please sign in to comment.