Skip to content

Commit

Permalink
Move some settings from setup to pyproject
Browse files Browse the repository at this point in the history
  • Loading branch information
dafeda committed Sep 20, 2023
1 parent c1ab4e6 commit d15fb11
Show file tree
Hide file tree
Showing 4 changed files with 86 additions and 86 deletions.
1 change: 1 addition & 0 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ sphinx-copybutton
sphinxcontrib-plantuml
sphinxcontrib.datatemplates
testpath
black
85 changes: 84 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[build-system]

requires = [
"setuptools<64",
"setuptools_scm[toml]>=6.2",
Expand All @@ -12,7 +11,91 @@ requires = [
"pybind11>=2.10.0", # If this comes out of sync with the version installed by Conan please update the version in CMakeLists
"grpcio-tools",
]
build-backend = "setuptools.build_meta"

[project]
name = "ert"
authors = [
{name = "Equinor ASA", email = "[email protected]"},
]
description = "Ensemble based Reservoir Tool (ERT)"
requires-python = ">=3.8"
readme = "README.md"
license = {text = "GPL-3.0"}
classifiers=[
"Development Status :: 5 - Production/Stable",
"Environment :: Other Environment",
"Intended Audience :: Science/Research",
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
"Natural Language :: English",
"Programming Language :: Python",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Topic :: Scientific/Engineering",
"Topic :: Scientific/Engineering :: Physics",
]
dynamic = ["version"]
dependencies=[
"aiofiles",
"aiohttp",
"alembic",
"ansicolors==1.1.8",
"async-generator",
"beartype > 0.11",
"cloudevents>=1.6.0",
"cloudpickle",
"tqdm>=4.62.0",
"cryptography",
"cwrap",
"dask_jobqueue",
"deprecation",
"dnspython >= 2",
"ecl >= 2.14.1",
"ert-storage >= 0.3.16",
"fastapi < 0.100.0",
"filelock",
"graphlib_backport; python_version < '3.9'",
"iterative_ensemble_smoother>=0.1.1",
"typing_extensions",
"jinja2",
"lark",
"matplotlib",
"numpy<2",
"packaging",
"pandas",
"pluggy>=1.3.0",
"protobuf",
"psutil",
"pydantic >= 1.10.8, < 2",
"PyQt5",
"pyrsistent",
"python-dateutil",
"pyyaml",
"qtpy",
"requests",
"scipy >= 1.10.1",
"sqlalchemy",
"uvicorn >= 0.17.0",
"websockets",
"httpx",
"tables",
"xarray",
"xtgeo >= 3.3.0",
"netCDF4",
"sortedcontainers"
]

[project.scripts]
ert = "ert.__main__:main"
"job_dispatch.py" = "_ert_job_runner.job_dispatch:main"

[project.urls]
Repository = "https://github.com/equinor/ert"

[tool.setuptools]
platforms = ["all"]

[tool.pytest.ini_options]
addopts = "-ra --strict-markers"
Expand Down
84 changes: 0 additions & 84 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,18 +74,7 @@ def package_files(directory):
return paths


with open("README.md") as f:
long_description = f.read()


args = dict(
name="ert",
author="Equinor ASA",
author_email="[email protected]",
description="Ensemble based Reservoir Tool (ERT)",
long_description=long_description,
long_description_content_type="text/markdown",
url="https://github.com/equinor/ert",
packages=find_packages(where="src"),
package_dir={"": "src"},
package_data={
Expand All @@ -96,65 +85,6 @@ def package_files(directory):
"job_queue/qstat_proxy.sh",
],
},
include_package_data=True,
license="GPL-3.0",
platforms="any",
python_requires=">=3.8",
install_requires=[
"aiofiles",
"aiohttp",
"alembic",
"ansicolors==1.1.8",
"async-generator",
"beartype > 0.11",
"cloudevents>=1.6.0",
"cloudpickle",
"tqdm>=4.62.0",
"cryptography",
"cwrap",
"dask_jobqueue",
"deprecation",
"dnspython >= 2",
"ecl >= 2.14.1",
"ert-storage >= 0.3.16",
"fastapi < 0.100.0",
"filelock",
"graphlib_backport; python_version < '3.9'",
"iterative_ensemble_smoother>=0.1.1",
"typing_extensions",
"jinja2",
"lark",
"matplotlib",
"numpy<2",
"packaging",
"pandas",
"pluggy>=1.3.0",
"protobuf",
"psutil",
"pydantic >= 1.10.8, < 2",
"PyQt5",
"pyrsistent",
"python-dateutil",
"pyyaml",
"qtpy",
"requests",
"scipy >= 1.10.1",
"sortedcontainers",
"sqlalchemy",
"uvicorn >= 0.17.0",
"websockets",
"httpx",
"tables",
"xarray",
"xtgeo >= 3.3.0",
"netCDF4",
],
entry_points={
"console_scripts": [
"ert=ert.__main__:main",
"job_dispatch.py = _ert_job_runner.job_dispatch:main",
]
},
cmake_args=[
"-DBUILD_TESTS=OFF",
# we can safely pass OSX_DEPLOYMENT_TARGET as it's ignored on
Expand All @@ -163,20 +93,6 @@ def package_files(directory):
"-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15",
],
cmake_source_dir="src/clib/",
classifiers=[
"Development Status :: 5 - Production/Stable",
"Environment :: Other Environment",
"Intended Audience :: Science/Research",
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
"Natural Language :: English",
"Programming Language :: Python",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Topic :: Scientific/Engineering",
"Topic :: Scientific/Engineering :: Physics",
],
cmdclass={
"egg_info": EggInfo,
"compile_protocol_buffers": CompileProtocolBuffers,
Expand Down
2 changes: 1 addition & 1 deletion src/ert/dark_storage/endpoints/responses.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ async def get_ensemble_response_dataframe(
res: LibresFacade = DEFAULT_LIBRESFACADE,
db: StorageReader = DEFAULT_STORAGE,
ensemble_id: UUID,
response_name: str
response_name: str,
) -> Response:
dataframe = data_for_key(res, db.get_ensemble(ensemble_id), response_name)
return Response(
Expand Down

0 comments on commit d15fb11

Please sign in to comment.