Skip to content

Commit

Permalink
Merge pull request #21 from PokeAPI/release-1.3.0
Browse files Browse the repository at this point in the history
Release 1.3.0
  • Loading branch information
GregHilmes authored Jul 9, 2020
2 parents e7d6956 + 0126ab9 commit d1699d2
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 26 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ __pycache__/

# Python setup.py distributions
dist/
build/
*.egg-info/

# Hypothesis for testing
.hypothesis/
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2017 Greg Hilmes
Copyright 2020 Greg Hilmes

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

Expand Down
23 changes: 10 additions & 13 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
======
===================
Pokebase |swampert|
======
===================

|travis| |pypi|

Expand All @@ -13,16 +13,9 @@ Maintainer: `GregHilmes <https://github.com/GregHilmes>`_
Important
=========
pokebase is under heavy construction right now, in order to clean up the code
and make it easier to maintain. I have also dropped support for Python 2.7, *for
the time being*. Hopefully this can be added in later. I recommend you continue using
version 1.2.0, download via ``pip``. Once I deem these new changes stable, I'll do another
PyPI release (with fancy new ``shelve`` caching!)

Planned To-do's for the current construction:

* APISubresource access
* complete rewrite of the docstrings, and hosting on `readthdocs.io <https://readthedocs.org/>`_
* Python 2.7 support
and make it easier to maintain. I recommend you continue using
version 1.3.0, download via ``pip``. Once these new changes are stable, there will be another
PyPI release.

Installation
============
Expand All @@ -31,6 +24,10 @@ Installation

It can't get much easier than that.

Pokebase has been tested against Python 3.6 and Python 3.6 only. If this is too
old for your needs, see the above note about the construction. Pokebase may
function under other version of Python, but bugs may occur.

Usage
=====

Expand Down Expand Up @@ -102,5 +99,5 @@ Do this :)
.. |travis| image:: https://travis-ci.org/PokeAPI/pokebase.svg?branch=master
:target: https://travis-ci.org/PokeAPI/pokebase

.. |pypi| image:: https://img.shields.io/badge/pypi-1.2.0-blue.svg
.. |pypi| image:: https://img.shields.io/badge/pypi-1.3.0-blue.svg
:target: https://pypi.python.org/pypi/pokebase
8 changes: 4 additions & 4 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
certifi==2018.4.16
certifi==2020.6.20
chardet==3.0.4
idna==2.7
requests==2.19.1
urllib3==1.23
idna==2.10
requests==2.24.0
urllib3==1.25.9
8 changes: 4 additions & 4 deletions requirements/test.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
attrs==18.1.0
certifi==2018.4.16
certifi==2020.6.20
chardet==3.0.4
idna==2.10
requests==2.24.0
urllib3==1.25.9
coverage==4.5.1
hypothesis==3.66.0
idna==2.7
requests==2.19.1
urllib3==1.23
8 changes: 4 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
from distutils.core import setup
import setuptools


def readme_text():
with open('README.rst') as f:
return f.read()


setup(
setuptools.setup(
name='pokebase',
packages=['pokebase'],
version='1.2.0',
version='1.3.0',
description='A Python wrapper for the friendly PokeAPI database',
long_description=readme_text(),
author='Greg Hilmes',
author_email='[email protected]',
url='https://github.com/GregHilmes/pokebase',
url='https://github.com/PokeAPI/pokebase',
keywords=['database', 'pokemon', 'wrapper'],
install_requires=['requests'],
license='BSD License',
Expand Down

0 comments on commit d1699d2

Please sign in to comment.