diff --git a/.travis.yml b/.travis.yml index f57c1e7..a9e5993 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ python: - "2.6" - "2.7" - "3.3" + - "3.4" - "pypy" install: pip install -e . # command to run tests diff --git a/README.md b/README.md index 0ca458d..01cbdf2 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Zencoder -------- -[![Build Status](https://travis-ci.org/zencoder/zencoder-py.png?branch=master)](https://travis-ci.org/zencoder/zencoder-py) +[![Build Status](https://travis-ci.org/zencoder/zencoder-py.svg?branch=master)](https://travis-ci.org/zencoder/zencoder-py) A Python module for interacting with the [Zencoder](http://zencoder.com) API. @@ -28,9 +28,9 @@ client = Zencoder('API_KEY') client = Zencoder() ``` -## [Jobs](https://app.zencoder.com/docs/api/jobs) +## [Jobs](https://brightcovelearning.github.io/Brightcove-API-References/zencoder-api/v2/doc/index.html#api-Jobs) -Create a [new job](https://app.zencoder.com/docs/api/jobs/create). +Create a [new job](https://brightcovelearning.github.io/Brightcove-API-References/zencoder-api/v2/doc/index.html#api-Jobs-Create_a_Job). ```python client.job.create('s3://bucket/key.mp4') @@ -47,7 +47,7 @@ response.code # 201 response.body['id'] # 12345 ``` -[List jobs](https://app.zencoder.com/docs/api/jobs/list). +[List jobs](https://brightcovelearning.github.io/Brightcove-API-References/zencoder-api/v2/doc/index.html#api-Jobs-List_Jobs). By default the jobs listing is paginated with 50 jobs per page and sorted by ID in descending order. You can pass two parameters to control the paging: `page` and `per_page`. @@ -56,7 +56,7 @@ client.job.list(per_page=10) client.job.list(per_page=10, page=2) ``` -Get [details](https://app.zencoder.com/docs/api/jobs/show) about a job. +Get [details](https://brightcovelearning.github.io/Brightcove-API-References/zencoder-api/v2/doc/index.html#api-Jobs-Get_Job_Details) about a job. The number passed to `details` is the ID of a Zencoder job. @@ -64,7 +64,7 @@ The number passed to `details` is the ID of a Zencoder job. client.job.details(1) ``` -Get [progress](https://app.zencoder.com/docs/api/jobs/progress) on a job. +Get [progress](https://brightcovelearning.github.io/Brightcove-API-References/zencoder-api/v2/doc/index.html#api-Jobs-Job_Progress) on a job. The number passed to `progress` is the ID of a Zencoder job. @@ -72,7 +72,7 @@ The number passed to `progress` is the ID of a Zencoder job. client.job.progress(1) ``` -[Resubmit](https://app.zencoder.com/docs/api/jobs/resubmit) a job +[Resubmit](https://brightcovelearning.github.io/Brightcove-API-References/zencoder-api/v2/doc/index.html#api-Jobs-Resubmit_a_Job) a job The number passed to `resubmit` is the ID of a Zencoder job. @@ -80,7 +80,7 @@ The number passed to `resubmit` is the ID of a Zencoder job. client.job.resubmit(1) ``` -[Cancel](https://app.zencoder.com/docs/api/jobs/cancel) a job +[Cancel](https://brightcovelearning.github.io/Brightcove-API-References/zencoder-api/v2/doc/index.html#api-Jobs-Cancel_a_Job) a job The number passed to `cancel` is the ID of a Zencoder job. @@ -88,46 +88,46 @@ The number passed to `cancel` is the ID of a Zencoder job. client.job.cancel(1) ``` -## [Inputs](https://app.zencoder.com/docs/api/inputs) +## [Inputs](https://brightcovelearning.github.io/Brightcove-API-References/zencoder-api/v2/doc/index.html#api-Inputs) -Get [details](https://app.zencoder.com/docs/api/inputs/show) about an input. +Get [details](https://brightcovelearning.github.io/Brightcove-API-References/zencoder-api/v2/doc/index.html#api-Inputs-Get_Input_Details) about an input. -The number passed to `details` is the ID of a Zencoder job. +The number passed to `details` is the ID of a Zencoder input. ```python client.input.details(1) ``` -Get [progress](https://app.zencoder.com/docs/api/inputs/progress) for an input. +Get [progress](https://brightcovelearning.github.io/Brightcove-API-References/zencoder-api/v2/doc/index.html#api-Inputs-Update_Input_Progress) for an input. -The number passed to `progress` is the ID of a Zencoder job. +The number passed to `progress` is the ID of a Zencoder input. ```python client.input.progress(1) ``` -## [Outputs](https://app.zencoder.com/docs/api/outputs) +## [Outputs](https://brightcovelearning.github.io/Brightcove-API-References/zencoder-api/v2/doc/index.html#api-Outputs) -Get [details](https://app.zencoder.com/docs/api/outputs/show) about an output. +Get [details](https://brightcovelearning.github.io/Brightcove-API-References/zencoder-api/v2/doc/index.html#api-Outputs-Get_Output_Details) about an output. -The number passed to `details` is the ID of a Zencoder job. +The number passed to `details` is the ID of a Zencoder output. ```python client.output.details(1) ``` -Get [progress](https://app.zencoder.com/docs/api/outputs/progress) for an output. +Get [progress](https://brightcovelearning.github.io/Brightcove-API-References/zencoder-api/v2/doc/index.html#api-Outputs-Update_Output_Progress) for an output. -The number passed to `progress` is the ID of a Zencoder job. +The number passed to `progress` is the ID of a Zencoder output. ```python client.output.progress(1) ``` -## [Reports](https://app.zencoder.com/docs/api/reports) +## [Reports](https://brightcovelearning.github.io/Brightcove-API-References/zencoder-api/v2/doc/index.html#api-Reports) -Reports are great for getting usage data for your account. All default to 30 days from yesterday with no [grouping](https://app.zencoder.com/docs/api/encoding/job/grouping), but this can be altered. These will return `422 Unprocessable Entity` if the date format is incorrect or the range is greater than 2 months. +Reports are great for getting usage data for your account. All default to 30 days from yesterday with no [grouping](https://support.brightcove.com/zencoder-encoding-settings-job#grouping), but this can be altered. These will return `422 Unprocessable Entity` if the date format is incorrect or the range is greater than 2 months. -Get [all usage](https://app.zencoder.com/docs/api/reports/all) (Live + VOD). +Get [all usage](https://brightcovelearning.github.io/Brightcove-API-References/zencoder-api/v2/doc/index.html#api-Reports-Get_Usage_for_VOD___Live) (Live + VOD). ```python import datetime @@ -140,7 +140,7 @@ client.report.all(start_date=datetime.date(2011, 10, 30), grouping="foo") ``` -Get [VOD usage](https://app.zencoder.com/docs/api/reports/vod). +Get [VOD usage](https://brightcovelearning.github.io/Brightcove-API-References/zencoder-api/v2/doc/index.html#api-Reports-Get_Usage_for_VOD). ```python import datetime @@ -153,7 +153,7 @@ client.report.vod(start_date=datetime.date(2011, 10, 30), grouping="foo") ``` -Get [Live usage](https://app.zencoder.com/docs/api/reports/live). +Get [Live usage](https://brightcovelearning.github.io/Brightcove-API-References/zencoder-api/v2/doc/index.html#api-Reports-Get_Usage_for_Live). ```python import datetime @@ -166,9 +166,9 @@ client.report.live(start_date=datetime.date(2011, 10, 30), grouping="foo") ``` -## [Accounts](https://app.zencoder.com/docs/api/accounts) +## [Accounts](https://brightcovelearning.github.io/Brightcove-API-References/zencoder-api/v2/doc/index.html#api-Accounts) -Create a [new account](https://app.zencoder.com/docs/api/accounts/create). A unique email address and terms of service are required, but you can also specify a password (and confirmation) along with whether or not you want to subscribe to the Zencoder newsletter. New accounts will be created under the Test (Free) plan. +Create a [new account](https://brightcovelearning.github.io/Brightcove-API-References/zencoder-api/v2/doc/index.html#api-Accounts-Create_an_Account). A unique email address and terms of service are required, but you can also specify a password (and confirmation) along with whether or not you want to subscribe to the Zencoder newsletter. New accounts will be created under the Test (Free) plan. No API Key is required. @@ -176,16 +176,17 @@ No API Key is required. client.account.create('foo@example.com', tos=1) client.account.create('foo@example.com', tos=1, options={'password': 'abcd1234', + 'password_confirmation': 'abcd1234', 'affiliate_code': 'foo'}) ``` -Get [details](https://app.zencoder.com/docs/api/accounts/show) about the current account. +Get [details](https://brightcovelearning.github.io/Brightcove-API-References/zencoder-api/v2/doc/index.html#api-Accounts-Get_Account_Details) about the current account. ```python client.account.details() ``` -Turn [integration mode](https://app.zencoder.com/docs/api/accounts/integration) on (all jobs are test jobs). +Turn [integration mode](https://brightcovelearning.github.io/Brightcove-API-References/zencoder-api/v2/doc/index.html#api-Accounts-Turn_On_Integration_Mode) on (all jobs are test jobs). ```python client.account.integration() diff --git a/setup.py b/setup.py index 72a075b..a564139 100644 --- a/setup.py +++ b/setup.py @@ -22,6 +22,8 @@ 'Programming Language :: Python', 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3.3', + 'Programming Language :: Python :: 3.4', 'Topic :: Software Development :: Libraries :: Python Modules' ] )