Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix dependency installation by conversion from setup.cfg to pyproject.toml #70

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
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
60 changes: 60 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
[build-system]
requires = ["pbr>=6.0.0", "setuptools>=64.0.0"]
build-backend = "pbr.build"

[project]
requires-python = ">=3.8"
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we should say 3.10, Jupyter is using this at the moment, and that is typically our source of truth for is python-chi working.

name = "python-chi"
authors = [
{name = "University of Chicago", email = "[email protected]"},
]
description = "Helper library for Chameleon Infrastructure (CHI) testbed"
dynamic = ["version"]
classifiers = [
"Development Status :: 4 - Beta",
"Environment :: Console",
"Environment :: OpenStack",
"Intended Audience :: Science/Research",
"Intended Audience :: System Administrators",
"Operating System :: OS Independent",
"Programming Language :: Python",
]
readme = "README.rst"
license = {file = "LICENSE"}

dependencies = [
"fabric",
"keystoneauth1",
"openstacksdk",
"paramiko",
"python-blazarclient @ git+https://github.com/ChameleonCloud/python-blazarclient",
"python-cinderclient",
"python-glanceclient",
"python-ironicclient",
"python-manilaclient",
"python-neutronclient",
"python-novaclient",
"python-swiftclient",
"python-zunclient",
"ipython",
"ipywidgets",
"networkx",
"matplotlib",
]

[project.optional-dependencies]
dev = [
"black",
"pytest",
"pytest-mock",
"pytest-watch",
"requests_mock"
]

[project.urls]
Homepage = "https://www.chameleoncloud.org"
Documentation = "https://python-chi.readthedocs.io/en/latest/"
Repository = "https://github.com/chameleoncloud/python-chi"

[tool.setuptools]
packages = ["chi"]
17 changes: 0 additions & 17 deletions requirements.txt

This file was deleted.

27 changes: 0 additions & 27 deletions setup.cfg

This file was deleted.

6 changes: 1 addition & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,4 @@

from setuptools import setup

setup(
setup_requires=["pbr"],
pbr=True,
version='{{VERSION_PLACEHOLDER}}'
)
setup(setup_requires=["pbr"])
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I had to change the invocation here, because if any arguments other than setup_requires was specified, PBR attempts to load the non-existing setup.cfg

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for pointing this out. I'm not sure if this changes how we were publishing to pypi, but I'll figure that out after merging.

5 changes: 0 additions & 5 deletions test-requirements.txt

This file was deleted.

3 changes: 1 addition & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ envlist = py38
[testenv]
usedevelop = True
passenv = OS_*
deps = .
-r{toxinidir}/test-requirements.txt
deps = .[dev]
changedir = tests
commands =
{posargs:pytest}
Expand Down
Loading