Skip to content

Commit c732a04

Browse files
authored
Merge pull request #1 from orltom/fix-ci-issues
Fix: some dependency issues and bug
2 parents e1346b4 + 1b733df commit c732a04

File tree

5 files changed

+13
-43
lines changed

5 files changed

+13
-43
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
python-version: [3.8]
14+
python-version: [3.13]
1515

1616
steps:
1717
- uses: actions/checkout@v2
@@ -30,4 +30,5 @@ jobs:
3030
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=180 --statistics
3131
- name: Test with pytest
3232
run: |
33-
python setup.py test
33+
pip install pytest
34+
pytest tests

README.md

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@ Provide for each resource endpoint an rest api client.
88
## Module workspace
99
Provide a fluent way to create or update an Airlock Gateway configuration.
1010

11-
## Documentation
12-
For full documentation and tutorials, trigger:
13-
```
14-
python setup.py build_sphinx
15-
```
16-
1711
## Requirements
1812
- Python 3.8 or higher
1913
- virutalenv
@@ -22,7 +16,7 @@ python setup.py build_sphinx
2216
```
2317
python3 -m venv env
2418
source env/bin/activate
25-
pip install -r requirement.txt
19+
pip install -r requirements.txt
2620
pip install -e .
2721
```
2822

@@ -39,9 +33,8 @@ python setup.py sdist bdist_wheel
3933
```
4034

4135
## Contributing
42-
Please use the [GitHub issue tracker](https://github.com/orltom/airlock-gateway-client-python/issues) to submit bugs or request features.
36+
Contributions are welcome in any form, be it code, logic, documentation, examples, requests, bug reports,
37+
ideas or anything else that will help this project move forward.
4338

4439
## Disclaimer
45-
Copyright Orlando Tomás.
46-
47-
Distributed under the terms of the MIT license, airlock-gateway-client is free and open source software.
40+
This project is licensed under the MIT License. See the LICENSE file for more details.

client/crud_client.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from .airlock_session import AirlockSession
2+
13
class ResourceRUClient:
24
def __init__(self, session: type(AirlockSession), base_path: str):
35
self.client = session

requirements.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
requests==2.25.0
2-
sphinx
3-
sphinx_rtd_theme
4-
pytest
5-
wheel
1+
requests==2.32.0
2+
wheel
3+
setuptools>=42.0.0

setup.py

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,15 @@
22
# -*- coding: utf-8 -*-
33
from version import __version__
44
from setuptools import setup
5-
from sphinx.setup_command import BuildDoc
6-
import subprocess
7-
8-
9-
class BuildDocApiDoc(BuildDoc, object):
10-
"""Execute sphinx-apidoc before trigger the sphinx-build"""
11-
12-
def run(self):
13-
sphinx_apidoc = subprocess.run(["sphinx-apidoc", "-f", "-o", "doc/source/", "client/"])
14-
if sphinx_apidoc.returncode != 0:
15-
raise Exception("sphinx-apidoc failed.")
16-
super(BuildDocApiDoc, self).run()
17-
185

196
setup(
207
version=__version__,
218
packages=[
229
'client',
2310
'workspace'
2411
],
25-
python_requires='>=3.8',
26-
install_requires=[
27-
'requests==2.24.0'
28-
],
12+
python_requires='>=3.13',
2913
setup_requires=[
30-
'sphinx',
31-
'sphinx_rtd_theme',
3214
'pytest-runner'
3315
],
34-
tests_require=[
35-
'pytest'
36-
],
37-
cmdclass={
38-
'build_sphinx': BuildDocApiDoc
39-
}
4016
)

0 commit comments

Comments
 (0)