Skip to content

Commit

Permalink
Merge branch 'release-4.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Milind220 committed Jan 24, 2023
2 parents 1cc6073 + 2e188f2 commit e6686c9
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 74 deletions.
7 changes: 1 addition & 6 deletions FILE_STRUCTURE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# File Structure
This document is a reference primer on Ozon3's files: what, where, and for what.
This document is a reference primer on Ozon3's files: what, where, and why.

- [src/](#src)
- [media/](#media)
Expand All @@ -17,7 +17,6 @@ This document is a reference primer on Ozon3's files: what, where, and for what.
- [.pre-commit-config.yaml](#pre-commit-configyaml)
- [pyproject.toml, setup.py, and setup.cfg](#pyprojecttoml-setuppy-and-setupcfg)
- [requirements.txt](#requirementstxt)
- [updateVersion.sh](#updateversionsh)
- [.github/](#github)
- [ISSUE_TEMPLATE/](#issue_template)
- [workflows/](#workflows)
Expand Down Expand Up @@ -89,10 +88,6 @@ Files used for purposes of packaging and installation. Also contains package inf

Dependency requirement file for development. Non-developing users won't need to install packages in this file, as the installation process will install the user requirements automatically.

## updateVersion.sh

A custom shell script to automatically increment version. This is purely a convenience script so that each time Ozon3 needs a new release, we won't need to alter the version numbers in multiple places by hand.

## .github/

This folder is related to GitHub repository and not necessarily part of Ozon3 package.
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = ozon3
version = 4.0.0
version = 4.0.1
author = Milind Sharma
author_email = [email protected]
description = An open-source package to easily obtain real-time, historical, or forecasted air quality data for anywhere in the world. Reliable, accurate and simple.
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"accurate and simple.",
license="GPLv3+",
url="https://github.com/Ozon3Org/Ozon3",
version="4.0.0",
download_url="https://github.com/Ozon3Org/Ozon3/archive/refs/tags/v4.0.0.tar.gz",
version="4.0.1",
download_url="https://github.com/Ozon3Org/Ozon3/archive/refs/tags/v4.0.1.tar.gz",
packages=setuptools.find_packages(),
install_requires=[
"numpy; python_version>='3'",
Expand Down
4 changes: 2 additions & 2 deletions src/ozon3/ozon3.py
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ def get_range_coordinates_air(
upper_bound: Tuple[float, float],
df: pandas.DataFrame = pandas.DataFrame(),
) -> pandas.DataFrame:
"""Get air quality data for range of coordinates between lower_bound and upper_bound
"""Get aqi data for range of coordinates b/w lower_bound and upper_bound
Args:
lower_bound (tuple): start coordinate
Expand Down Expand Up @@ -539,7 +539,7 @@ def get_city_station_options(self, city: str) -> pandas.DataFrame:
).sort_values(by=["score"], ascending=False)

def get_historical_data(
self, city: str = None, city_id: int = None
self, city: str = None, city_id: int = None # type: ignore
) -> pandas.DataFrame:
"""Get historical air quality data for a city
Expand Down
3 changes: 1 addition & 2 deletions tests/utils.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from pathlib import Path
from urllib.parse import urlsplit, urlunsplit, urlencode
import vcr
from decouple import config
Expand Down Expand Up @@ -36,4 +35,4 @@ def before_record_response(response):
# Prepare a global Ozon3 object
WAQI_TOKEN = config("WAQI_TOKEN", default="DUMMY_TOKEN")
with vcr.use_cassette("tests/cassettes/ozon3_init.yaml", **vcr_kwargs):
api = Ozon3(WAQI_TOKEN)
api = Ozon3(WAQI_TOKEN) # type: ignore
61 changes: 0 additions & 61 deletions updateVersion.sh

This file was deleted.

0 comments on commit e6686c9

Please sign in to comment.