Skip to content

Commit 036f85a

Browse files
authored
Merge pull request #458 from mshriver/move-to-hatch
Migrate to hatch
2 parents 0f994f9 + 0cf856e commit 036f85a

6 files changed

Lines changed: 98 additions & 100 deletions

File tree

.github/workflows/pull_request.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,16 @@ jobs:
3030
sudo apt-get install -y libgnutls28-dev libcurl4-openssl-dev libssl-dev
3131
# Uninstall pycurl - its likely not installed, but in case the ubuntu-latest packages change
3232
# then compile and install it with PYCURL_SSL_LIBRARY set to openssl
33-
pip install -U pip
33+
pip install -U pip wheel
3434
pip uninstall -y pycurl
3535
pip install --compile --no-cache-dir pycurl
36-
pip install -Ur requirements-test.txt --upgrade-strategy eager
36+
pip install -U -e .[test]
37+
38+
# coming soon
39+
#- name: Pre Commit Checks
40+
# uses: pre-commit/action@v3.0.0
41+
# with:
42+
# extra_args: --show-diff-on-failure
3743

3844
- name: Run Unit Tests
3945
run: py.test tests/ -v --cov wrapanapi
40-
41-
- name: Analysis (git diff)
42-
if: failure()
43-
run: git diff

.github/workflows/release_to_pypi.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
sudo apt-get install -y libgnutls28-dev libcurl4-openssl-dev libssl-dev
2929
# Uninstall pycurl - its likely not installed, but in case the ubuntu-latest packages change
3030
# then compile and install it with PYCURL_SSL_LIBRARY set to openssl
31-
pip install -U pip
31+
pip install -U pip wheel
3232
pip uninstall -y pycurl
3333
pip install --compile --no-cache-dir pycurl
34-
pip install -Ur requirements-test.txt --upgrade-strategy eager
34+
pip install -U .[test]
3535
3636
- name: Run Unit Tests
3737
run: py.test tests/ -v --cov wrapanapi
@@ -56,11 +56,9 @@ jobs:
5656

5757
- name: Setup and Build
5858
run: |
59-
sudo apt update
60-
pip install -U pip
61-
pip install setuptools_scm wheel twine
62-
python setup.py sdist bdist_wheel
63-
python -m twine check dist/*
59+
pip install -U pip wheel twine hatch
60+
hatch build
61+
twine check dist/*
6462
6563
- name: Release to PyPi
6664
uses: pypa/gh-action-pypi-publish@release/v1

pyproject.toml

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
[build-system]
2+
requires = ["hatchling", "hatch-vcs"]
3+
build-backend = "hatchling.build"
4+
5+
[tool.hatch.version]
6+
source = "vcs"
7+
8+
[tool.hatch.build.targets.sdist]
9+
include = [
10+
"/wrapanapi",
11+
]
12+
13+
[tool.hatch.build.targets.wheel]
14+
packages = [
15+
"/wrapanapi",
16+
]
17+
18+
[project.urls]
19+
"Source" = "https://github.com/RedHatQE/wrapanapi"
20+
21+
[project]
22+
name = "wrapanapi"
23+
dynamic = ["version"]
24+
readme = "README.rst"
25+
license-files = { paths = ["LICENSE"] }
26+
authors = [
27+
{ name = "Peter Savage" },
28+
]
29+
maintainers = [
30+
{ name = "Jitendra Yejare" },
31+
{ name = "Mike Shriver" },
32+
]
33+
keywords = [
34+
"distutils",
35+
"hatch",
36+
"hyperscaler",
37+
"api",
38+
"cloud",
39+
]
40+
dependencies = [
41+
"azure-storage-common>=1.0",
42+
"azure<5.0.0",
43+
"boto",
44+
"boto3",
45+
"botocore",
46+
"cached_property",
47+
"dateparser",
48+
"fauxfactory",
49+
"google-api-python-client",
50+
"google-compute-engine",
51+
"inflection",
52+
"lxml",
53+
"miq-version",
54+
"oauth2client",
55+
"openshift==0.3.4",
56+
"ovirt-engine-sdk-python~=4.3",
57+
"packaging",
58+
"py3winrm==0.0.1",
59+
"python-cinderclient",
60+
"python-glanceclient",
61+
"python-heatclient",
62+
"python-ironicclient",
63+
"python-keystoneclient",
64+
"python-neutronclient==6.12.0",
65+
"python-novaclient==7.1.2",
66+
"python-swiftclient",
67+
"pyvcloud==19.1.2",
68+
"pyvmomi>=6.5.0.2017.5.post1",
69+
"redfish-client==0.1.0",
70+
"requests",
71+
"tzlocal",
72+
"vspk==5.3.2",
73+
"wait_for",
74+
"websocket_client",
75+
]
76+
77+
[project.optional-dependencies]
78+
test = [
79+
"mock",
80+
"pytest",
81+
"pytest-cov",
82+
"pytest-mock",
83+
"pytest-variables",
84+
"coveralls",
85+
]

requirements-test.txt

Lines changed: 0 additions & 11 deletions
This file was deleted.

setup.cfg

Lines changed: 0 additions & 70 deletions
This file was deleted.

setup.py

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)