Skip to content
This repository was archived by the owner on Mar 4, 2026. It is now read-only.

Commit 22d7e6d

Browse files
committed
Merge branch 'release-prep'
* release-prep: bump version to 1.36.0 house cleaning of setup.py move lint/yapf config to setup.cfg add CHANGELOG.md README: link to the License file README: fix minor nits
2 parents 5501267 + 139f889 commit 22d7e6d

6 files changed

Lines changed: 82 additions & 24 deletions

File tree

.style.yapf

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

CHANGELOG.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# Changelog
2+
All notable changes to this project will be documented in this file.
3+
4+
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
5+
This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
6+
7+
8+
## [1.36.0] - 2017-10-16
9+
### Added
10+
- Better tests using PacketMockManager
11+
- Test on 2.7 and 3.[3-6]
12+
- Changelog
13+
14+
### Changed
15+
- Use tox for testing
16+
17+
## [1.35] - 2017-08-04
18+
### Fixed
19+
- Some tests were broken
20+
21+
## [1.35]
22+
### Added
23+
- `public_ipv4_subnet_size`
24+
25+
## [1.34] - 2017-08-04
26+
### Added
27+
- Custom iPXE and `always_pxe` setting
28+
- Volume coloning
29+
- Device Tags
30+
31+
### Fixed
32+
- Handling of error messages from api response
33+
34+
## [1.33] - 2017-03-15
35+
### Fixed
36+
- Default payment method

README.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Examples
2323
### List projects
2424

2525
```python
26-
import packet
26+
import packet
2727
manager = packet.Manager(auth_token="yourapiauthtoken")
2828

2929
projects = manager.list_projects()
@@ -47,7 +47,7 @@ for plan in plans:
4747
### Creating a Device
4848

4949
```python
50-
import packet
50+
import packet
5151
manager = packet.Manager(auth_token="yourapiauthtoken")
5252

5353
device = manager.create_device(project_id='project-id',
@@ -60,7 +60,7 @@ print(device)
6060
### Checking the status and rebooting a Device
6161

6262
```python
63-
import packet
63+
import packet
6464
manager = packet.Manager(auth_token="yourapiauthtoken")
6565

6666
device = manager.get_device('device-id')
@@ -70,7 +70,7 @@ device.reboot()
7070

7171
### Listing all devices, limiting to 50 per page
7272

73-
// Packet API defaults to a limit of 10 per page
73+
_Packet API defaults to a limit of 10 per page_
7474

7575
```python
7676
import packet
@@ -101,4 +101,9 @@ https://github.com/koalalorenzo/python-digitalocean
101101
Copyright
102102
---------
103103

104-
Copyright (c) 2015 Packet Host. See `LICENSE.txt` for further details.
104+
Copyright (c) 2017 Packet Host. See [License](https://github.com/packethost/packet-python/LICENSE.txt) for further details.
105+
106+
Changes
107+
-------
108+
109+
See the [Changelog](https://github.com/packethost/packet-python/CHANGES.md) for further details.

pylama.ini

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

setup.cfg

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,13 @@
11
[bdist_wheel]
22
universal=1
3+
4+
[flake8]
5+
max-line-length = 120
6+
7+
[pylama:pycodestyle]
8+
max_line_length = 120
9+
10+
[yapf]
11+
based_on_style = chromium
12+
column_limit = 120
13+
indent_width = 4

setup.py

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,39 @@
11
#!/usr/bin/env python
2-
import os
2+
3+
import pypandoc
4+
35
try:
46
from setuptools import setup
57
except ImportError:
68
from ez_setup import use_setuptools
79
use_setuptools()
810
from setuptools import setup
911

10-
long_description = """This library provides the python client for the Packet API."""
11-
12-
if os.path.isfile("README.md"):
13-
with open('README.md') as file:
14-
long_description = file.read()
12+
readme = pypandoc.convert_file('README.md', 'rst')
13+
changelog = pypandoc.convert_file('CHANGELOG.md', 'rst')
1514

1615
setup(
1716
name='packet-python',
18-
version='1.35',
17+
version='1.36.0',
1918
description='Packet API client',
20-
author='Aaron Welch ( http://www.packet.net )',
21-
author_email='welch@packet.net',
22-
url='https://github.com/packethost/packet-python.git',
23-
packages=['packet'],
24-
install_requires=['requests'],
19+
long_description=readme + '\n' + changelog,
20+
url='https://github.com/packethost/packet-python',
21+
author='Packet Developers',
2522
license='LGPL v3',
2623
keywords='packet api client',
27-
long_description=long_description)
24+
packages=['packet'],
25+
install_requires='requests',
26+
setup_requires='pypandoc',
27+
classifiers=[
28+
'Development Status :: 5 - Production/Stable',
29+
'Intended Audience :: Developers',
30+
'Intended Audience :: Information Technology',
31+
'License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)',
32+
'Programming Language :: Python :: 2',
33+
'Programming Language :: Python :: 2.7',
34+
'Programming Language :: Python :: 3',
35+
'Programming Language :: Python :: 3.3',
36+
'Programming Language :: Python :: 3.4',
37+
'Programming Language :: Python :: 3.5',
38+
'Programming Language :: Python :: 3.6',
39+
])

0 commit comments

Comments
 (0)