Skip to content
This repository has been archived by the owner on Apr 23, 2024. It is now read-only.

Commit

Permalink
Merge branch 'release/0.22.0' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
SebRut committed Sep 7, 2020
2 parents 509d87a + cc03854 commit 74ee550
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ ko_fi: sebrut
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
issuehunt: SebRut/pygrocy
otechie: # Replace with a single Otechie username
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
- docker

before_install:
- git clone --branch v2.7.1-3 https://github.com/grocy/grocy-docker.git
- git clone --branch v2.7.1-4 https://github.com/grocy/grocy-docker.git
- cd grocy-docker
- docker-compose pull
- GROCY_MODE=demo docker-compose up -d
Expand Down
24 changes: 22 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,26 @@
# Changelog

## [v0.22.0](https://github.com/SebRut/pygrocy/tree/v0.22.0) (2020-09-07)

[Full Changelog](https://github.com/SebRut/pygrocy/compare/v0.21.0...v0.22.0)

**Implemented enhancements:**

- prepare 1.0.0 release [\#80](https://github.com/SebRut/pygrocy/issues/80)
- Consider release to comply with semver [\#33](https://github.com/SebRut/pygrocy/issues/33)

**Fixed bugs:**

- With product location disabled nothing works [\#129](https://github.com/SebRut/pygrocy/issues/129)

**Merged pull requests:**

- check if location field exists before parsing [\#130](https://github.com/SebRut/pygrocy/pull/130) ([SebRut](https://github.com/SebRut))
- Update responses requirement from ~=0.11.0 to ~=0.12.0 [\#128](https://github.com/SebRut/pygrocy/pull/128) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Update pdoc3 requirement from ~=0.9.0 to ~=0.9.1 [\#126](https://github.com/SebRut/pygrocy/pull/126) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Update pdoc3 requirement from ~=0.8.4 to ~=0.9.0 [\#125](https://github.com/SebRut/pygrocy/pull/125) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Update responses requirement from ~=0.10.16 to ~=0.11.0 [\#124](https://github.com/SebRut/pygrocy/pull/124) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))

## [v0.21.0](https://github.com/SebRut/pygrocy/tree/v0.21.0) (2020-08-18)

[Full Changelog](https://github.com/SebRut/pygrocy/compare/v0.20.0...v0.21.0)
Expand All @@ -21,7 +42,6 @@
- init all Product fields with None by default [\#123](https://github.com/SebRut/pygrocy/pull/123) ([SebRut](https://github.com/SebRut))
- Check for empty string in parse\_date [\#120](https://github.com/SebRut/pygrocy/pull/120) ([isabellaalstrom](https://github.com/isabellaalstrom))
- Update coveralls requirement from ~=2.1.1 to ~=2.1.2 [\#108](https://github.com/SebRut/pygrocy/pull/108) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Update responses requirement from ~=0.10.15 to ~=0.10.16 [\#107](https://github.com/SebRut/pygrocy/pull/107) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))

## [v0.20.0](https://github.com/SebRut/pygrocy/tree/v0.20.0) (2020-08-16)

Expand Down Expand Up @@ -76,6 +96,7 @@

- Bugfix/bug smashing [\#111](https://github.com/SebRut/pygrocy/pull/111) ([SebRut](https://github.com/SebRut))
- Add meal plan / recipe interfaces. \#90 [\#109](https://github.com/SebRut/pygrocy/pull/109) ([nervetattoo](https://github.com/nervetattoo))
- Update responses requirement from ~=0.10.15 to ~=0.10.16 [\#107](https://github.com/SebRut/pygrocy/pull/107) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Update pdoc3 requirement from ~=0.8.3 to ~=0.8.4 [\#105](https://github.com/SebRut/pygrocy/pull/105) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Update coveralls requirement from ~=2.0.0 to ~=2.1.1 [\#104](https://github.com/SebRut/pygrocy/pull/104) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Update pdoc3 requirement from ~=0.8.1 to ~=0.8.3 [\#102](https://github.com/SebRut/pygrocy/pull/102) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
Expand Down Expand Up @@ -107,7 +128,6 @@
- finish abstraction from api [\#96](https://github.com/SebRut/pygrocy/pull/96) ([SebRut](https://github.com/SebRut))
- fix travis build [\#93](https://github.com/SebRut/pygrocy/pull/93) ([SebRut](https://github.com/SebRut))
- Update responses requirement from ~=0.10.12 to ~=0.10.14 [\#89](https://github.com/SebRut/pygrocy/pull/89) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Update pdoc3 requirement from ~=0.6.4 to ~=0.8.1 [\#88](https://github.com/SebRut/pygrocy/pull/88) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Update coveralls requirement from ~=1.11.1 to ~=2.0.0 [\#86](https://github.com/SebRut/pygrocy/pull/86) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Fix \#81 [\#82](https://github.com/SebRut/pygrocy/pull/82) ([BlueBlueBlob](https://github.com/BlueBlueBlob))

Expand Down
5 changes: 1 addition & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
[![Coverage Status](https://coveralls.io/repos/github/SebRut/pygrocy/badge.svg?branch=master)](https://coveralls.io/github/SebRut/pygrocy?branch=master)
[![CodeFactor](https://www.codefactor.io/repository/github/sebrut/pygrocy/badge)](https://www.codefactor.io/repository/github/sebrut/pygrocy)
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2FSebRut%2Fpygrocy.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2FSebRut%2Fpygrocy?ref=badge_shield)
[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)

[Documentation](https://sebrut.github.io/pygrocy/)

Expand Down Expand Up @@ -46,7 +47,3 @@ You can setup url, port and ssl in test/test_const.py

## License
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2FSebRut%2Fpygrocy.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2FSebRut%2Fpygrocy?ref=badge_large)

---

[![ko-fi](https://www.ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/X8X1LYUK)
6 changes: 5 additions & 1 deletion pygrocy/grocy_api_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,11 @@ def __init__(self, parsed_json):
parsed_json.get("quantity_unit_stock")
)

self._location = LocationData(parsed_json.get("location"))
raw_location = parsed_json.get("location")
if raw_location is None:
self._location = None
else:
self._location = LocationData(raw_location)

@property
def last_purchased(self) -> datetime:
Expand Down
4 changes: 2 additions & 2 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
coveralls~=2.1.2
doctr~=1.8.0
pdoc3~=0.8.4
responses~=0.10.16
pdoc3~=0.9.1
responses~=0.12.0
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

setuptools.setup(
name="pygrocy",
version="0.21.0",
version="0.22.0",
author="Sebastian Rutofski",
author_email="[email protected]",
description="",
Expand Down

0 comments on commit 74ee550

Please sign in to comment.