Skip to content

Commit 016cee8

Browse files
committed
Merge branch 'release/v1.1.0'
2 parents efb642f + fb3b4fa commit 016cee8

File tree

423 files changed

+7570
-2902
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

423 files changed

+7570
-2902
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,7 @@ var/
2424

2525
# OS
2626
.DS_Store
27+
28+
# Typical virtual environment dirs
29+
.venv/
30+
venv/

.travis.yml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
11
language: python
22
os: linux
3+
34
install: skip
45
jobs:
56
include:
67
- stage: check_release_steps
7-
scripts: "./.travis/check_release_step.sh"
8+
script: "./.travis/check_release_step.sh"
89
- stage: build
9-
scripts: "./.travis/build.sh"
10-
addons:
11-
artifacts:
12-
working_dir: dist/
13-
target_paths: ${ARTIFACTS_JOB_ID}/${TRAVIS_OS_NAME}/${TRAVIS_COMMIT:0:8}
10+
script:
11+
- python setup.py sdist bdist_wheel
12+
- stage: test-install-src
13+
script:
14+
- python setup.py sdist
15+
- pip install dist/gs_api_client-$(python setup.py --version).tar.gz
16+
- stage: test-install-wheel
17+
script:
18+
- python setup.py bdist_wheel
19+
- pip install dist/gs_api_client-$(python setup.py --version)-py3-none-any.whl
20+
- stage: test_unittest
21+
script: "./.travis/test_unittest.sh"
22+
- stage: upload_to_pypi_org
23+
script: "./.travis/upload_to_apipy_org.sh"
24+

.travis/build.sh

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

.travis/check_release_step.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env bash
2-
2+
set -ev
33
echo "Checking release version $(python setup.py --version)"
44

55
if git tag | grep -qE "^v$(python setup.py --version)$"; then echo "Release already exists"; exit 1; fi

.travis/test_unittest.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/usr/bin/env bash
2+
set -ev
3+
echo "Running unittests"
4+
5+
python -m venv .venv
6+
source .venv/bin/activate
7+
python -m pip install -r dev-requirements.txt
8+
pytest
9+
10+
echo "Running unittests Done"
11+

.travis/upload_to_apipy_org.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/usr/bin/env bash
2+
set -ev
3+
4+
echo "Uploading package to pypi.org"
5+
6+
# pip install twine
7+
# twine upload -u __token__ -p "$PYPI_ORG_TOKEN" dist/gs_api_client-*
8+
9+
echo "Upload Done"

CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,20 @@
1515
- Add get_deleted_loadbalancers() endpoint
1616
- Add renew_paas_service_credentials() endpoint
1717
- Remove deprecated create_label() and delete_label() endpoints
18+
19+
## [v1.0.4]
20+
21+
- Add get_storage_backups()
22+
- Add delete_storage_backup()
23+
- Add rollback_storage_backup()
24+
- Add get_storage_backup_schedules()
25+
- Add create_storage_backup_schedule()
26+
- Add get_storage_backup_schedule()
27+
- Add delete_storage_backup_schedule()
28+
- Add update_storage_backup_schedule()
29+
- Replace get_marketplace_templates() with get_marketplace_applications()
30+
- Replace get_marketplace_template() with get_marketplace_application()
31+
- Replace create_marketplace_template() with create_marketplace_application()
32+
- Replace update_marketplace_template() with update_marketplace_application()
33+
- Replace delete_marketplace_template() with delete_marketplace_application()
34+
- Replace get_marketplace_template_events() with get_marketplace_application_events()

CONTRIBUTING.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,5 @@ GitHub project.
1616

1717
## Submitting Patches
1818

19-
The gridscale_api_client_python source code is managed using the git distributed source control
19+
The gridscale_api_client_python source code is managed using the git distributed source control
2020
management tool <https://www.git-scm.org/>. Please submit patches accordingly.
21-

0 commit comments

Comments
 (0)