From 19a05257fe0ae3137c8d726aaeb496cf4bc947b7 Mon Sep 17 00:00:00 2001 From: Jonathan Schweder Date: Sun, 6 Jun 2021 11:13:02 +0000 Subject: [PATCH] Fixing tests --- .openapi-generator/FILES | 31 ++++++++++++++----- Makefile | 2 ++ README.md | 2 +- brasil_api/{brasil_api => api}/__init__.py | 0 brasil_api/{brasil_api => api}/banks_api.py | 0 brasil_api/{brasil_api => api}/cep_api.py | 0 brasil_api/{brasil_api => api}/cep_v2_api.py | 0 brasil_api/{brasil_api => api}/cnpj_api.py | 0 brasil_api/{brasil_api => api}/ddd_api.py | 0 .../feriados_nacionais_api.py | 0 brasil_api/{brasil_api => api}/ibge_api.py | 0 brasil_api/apis/__init__.py | 14 ++++----- docs/BanksApi.md | 4 +-- docs/CEPApi.md | 2 +- docs/CEPV2Api.md | 2 +- docs/CNPJApi.md | 2 +- docs/DDDApi.md | 2 +- docs/FeriadosNacionaisApi.md | 2 +- docs/IBGEApi.md | 4 +-- test/test_banks_api.py | 8 ++--- test/test_cep_api.py | 2 +- test/test_cep_v2_api.py | 2 +- test/test_cnpj_api.py | 2 +- test/test_ddd_api.py | 2 +- test/test_feriados_nacionais_api.py | 2 +- test/test_ibge_api.py | 2 +- 26 files changed, 52 insertions(+), 35 deletions(-) rename brasil_api/{brasil_api => api}/__init__.py (100%) rename brasil_api/{brasil_api => api}/banks_api.py (100%) rename brasil_api/{brasil_api => api}/cep_api.py (100%) rename brasil_api/{brasil_api => api}/cep_v2_api.py (100%) rename brasil_api/{brasil_api => api}/cnpj_api.py (100%) rename brasil_api/{brasil_api => api}/ddd_api.py (100%) rename brasil_api/{brasil_api => api}/feriados_nacionais_api.py (100%) rename brasil_api/{brasil_api => api}/ibge_api.py (100%) diff --git a/.openapi-generator/FILES b/.openapi-generator/FILES index 7e4dd4e..66d12c8 100644 --- a/.openapi-generator/FILES +++ b/.openapi-generator/FILES @@ -3,16 +3,16 @@ .travis.yml README.md brasil_api/__init__.py +brasil_api/api/__init__.py +brasil_api/api/banks_api.py +brasil_api/api/cep_api.py +brasil_api/api/cep_v2_api.py +brasil_api/api/cnpj_api.py +brasil_api/api/ddd_api.py +brasil_api/api/feriados_nacionais_api.py +brasil_api/api/ibge_api.py brasil_api/api_client.py brasil_api/apis/__init__.py -brasil_api/brasil_api/__init__.py -brasil_api/brasil_api/banks_api.py -brasil_api/brasil_api/cep_api.py -brasil_api/brasil_api/cep_v2_api.py -brasil_api/brasil_api/cnpj_api.py -brasil_api/brasil_api/ddd_api.py -brasil_api/brasil_api/feriados_nacionais_api.py -brasil_api/brasil_api/ibge_api.py brasil_api/configuration.py brasil_api/exceptions.py brasil_api/model/__init__.py @@ -48,4 +48,19 @@ setup.cfg setup.py test-requirements.txt test/__init__.py +test/test_bank_v1.py +test/test_banks_api.py +test/test_cep_api.py +test/test_cep_v2_api.py +test/test_cepv1.py +test/test_cepv2.py +test/test_cnpj_api.py +test/test_ddd_api.py +test/test_dddv1.py +test/test_empresa_v1.py +test/test_feriado_v1.py +test/test_feriados_nacionais_api.py +test/test_ibge_api.py +test/test_ibgev1.py +test/test_ibgev1_regiao.py tox.ini diff --git a/Makefile b/Makefile index 390d737..ca01113 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,7 @@ +.PHONY: build build: python3 setup.py sdist bdist_wheel +.PHONY: publish publish: build python3 -m twine upload --repository-url https://upload.pypi.org/legacy/ dist/* diff --git a/README.md b/README.md index a904f0c..423a629 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ Please follow the [installation procedure](#installation--usage) and then run th import time import brasil_api from pprint import pprint -from brasil_api import banks_api +from brasil_api.api import banks_api from brasil_api.model.bank_v1 import BankV1 # Defining the host is optional and defaults to https://brasilapi.com.br/api # See configuration.py for a list of all supported configuration parameters. diff --git a/brasil_api/brasil_api/__init__.py b/brasil_api/api/__init__.py similarity index 100% rename from brasil_api/brasil_api/__init__.py rename to brasil_api/api/__init__.py diff --git a/brasil_api/brasil_api/banks_api.py b/brasil_api/api/banks_api.py similarity index 100% rename from brasil_api/brasil_api/banks_api.py rename to brasil_api/api/banks_api.py diff --git a/brasil_api/brasil_api/cep_api.py b/brasil_api/api/cep_api.py similarity index 100% rename from brasil_api/brasil_api/cep_api.py rename to brasil_api/api/cep_api.py diff --git a/brasil_api/brasil_api/cep_v2_api.py b/brasil_api/api/cep_v2_api.py similarity index 100% rename from brasil_api/brasil_api/cep_v2_api.py rename to brasil_api/api/cep_v2_api.py diff --git a/brasil_api/brasil_api/cnpj_api.py b/brasil_api/api/cnpj_api.py similarity index 100% rename from brasil_api/brasil_api/cnpj_api.py rename to brasil_api/api/cnpj_api.py diff --git a/brasil_api/brasil_api/ddd_api.py b/brasil_api/api/ddd_api.py similarity index 100% rename from brasil_api/brasil_api/ddd_api.py rename to brasil_api/api/ddd_api.py diff --git a/brasil_api/brasil_api/feriados_nacionais_api.py b/brasil_api/api/feriados_nacionais_api.py similarity index 100% rename from brasil_api/brasil_api/feriados_nacionais_api.py rename to brasil_api/api/feriados_nacionais_api.py diff --git a/brasil_api/brasil_api/ibge_api.py b/brasil_api/api/ibge_api.py similarity index 100% rename from brasil_api/brasil_api/ibge_api.py rename to brasil_api/api/ibge_api.py diff --git a/brasil_api/apis/__init__.py b/brasil_api/apis/__init__.py index 53365cc..fd341d3 100644 --- a/brasil_api/apis/__init__.py +++ b/brasil_api/apis/__init__.py @@ -14,10 +14,10 @@ # sys.setrecursionlimit(n) # Import APIs into API package: -from brasil_api.banks_api import BanksApi -from brasil_api.cep_api import CEPApi -from brasil_api.cep_v2_api import CEPV2Api -from brasil_api.cnpj_api import CNPJApi -from brasil_api.ddd_api import DDDApi -from brasil_api.feriados_nacionais_api import FeriadosNacionaisApi -from brasil_api.ibge_api import IBGEApi +from brasil_api.api.banks_api import BanksApi +from brasil_api.api.cep_api import CEPApi +from brasil_api.api.cep_v2_api import CEPV2Api +from brasil_api.api.cnpj_api import CNPJApi +from brasil_api.api.ddd_api import DDDApi +from brasil_api.api.feriados_nacionais_api import FeriadosNacionaisApi +from brasil_api.api.ibge_api import IBGEApi diff --git a/docs/BanksApi.md b/docs/BanksApi.md index 78d93d3..89ab7b7 100644 --- a/docs/BanksApi.md +++ b/docs/BanksApi.md @@ -18,7 +18,7 @@ Busca as informações de um banco a partir de um código ```python import time import brasil_api -from brasil_api import banks_api +from brasil_api.api import banks_api from brasil_api.model.bank_v1 import BankV1 from pprint import pprint # Defining the host is optional and defaults to https://brasilapi.com.br/api @@ -82,7 +82,7 @@ Retorna informações de todos os bancos do Brasil ```python import time import brasil_api -from brasil_api import banks_api +from brasil_api.api import banks_api from brasil_api.model.bank_v1 import BankV1 from pprint import pprint # Defining the host is optional and defaults to https://brasilapi.com.br/api diff --git a/docs/CEPApi.md b/docs/CEPApi.md index 80380fe..30cd745 100644 --- a/docs/CEPApi.md +++ b/docs/CEPApi.md @@ -17,7 +17,7 @@ Busca por CEP com múltiplos providers de fallback. ```python import time import brasil_api -from brasil_api import cep_api +from brasil_api.api import cep_api from brasil_api.model.cepv1 import CEPV1 from pprint import pprint # Defining the host is optional and defaults to https://brasilapi.com.br/api diff --git a/docs/CEPV2Api.md b/docs/CEPV2Api.md index 1f4d82d..657299b 100644 --- a/docs/CEPV2Api.md +++ b/docs/CEPV2Api.md @@ -17,7 +17,7 @@ Busca por CEP com múltiplos providers de fallback v2. ```python import time import brasil_api -from brasil_api import cep_v2_api +from brasil_api.api import cep_v2_api from brasil_api.model.cepv2 import CEPV2 from pprint import pprint # Defining the host is optional and defaults to https://brasilapi.com.br/api diff --git a/docs/CNPJApi.md b/docs/CNPJApi.md index 1944438..f8f1919 100644 --- a/docs/CNPJApi.md +++ b/docs/CNPJApi.md @@ -17,7 +17,7 @@ Busca por CNPJ na API Minha Receita. ```python import time import brasil_api -from brasil_api import cnpj_api +from brasil_api.api import cnpj_api from brasil_api.model.empresa_v1 import EmpresaV1 from pprint import pprint # Defining the host is optional and defaults to https://brasilapi.com.br/api diff --git a/docs/DDDApi.md b/docs/DDDApi.md index a0f774e..7dd0700 100644 --- a/docs/DDDApi.md +++ b/docs/DDDApi.md @@ -17,7 +17,7 @@ Retorna estado e lista de cidades por DDD ```python import time import brasil_api -from brasil_api import ddd_api +from brasil_api.api import ddd_api from brasil_api.model.dddv1 import DDDV1 from pprint import pprint # Defining the host is optional and defaults to https://brasilapi.com.br/api diff --git a/docs/FeriadosNacionaisApi.md b/docs/FeriadosNacionaisApi.md index 04d75e3..8ba57d0 100644 --- a/docs/FeriadosNacionaisApi.md +++ b/docs/FeriadosNacionaisApi.md @@ -19,7 +19,7 @@ Calcula os feriados móveis baseados na Páscoa e adiciona os feriados fixos ```python import time import brasil_api -from brasil_api import feriados_nacionais_api +from brasil_api.api import feriados_nacionais_api from brasil_api.model.feriado_v1 import FeriadoV1 from pprint import pprint # Defining the host is optional and defaults to https://brasilapi.com.br/api diff --git a/docs/IBGEApi.md b/docs/IBGEApi.md index b195201..0b8182a 100644 --- a/docs/IBGEApi.md +++ b/docs/IBGEApi.md @@ -18,7 +18,7 @@ Busca as informações de um um estado a partir da sigla ou código ```python import time import brasil_api -from brasil_api import ibge_api +from brasil_api.api import ibge_api from brasil_api.model.ibgev1 import IBGEV1 from pprint import pprint # Defining the host is optional and defaults to https://brasilapi.com.br/api @@ -82,7 +82,7 @@ Retorna informações de todos estados do Brasil ```python import time import brasil_api -from brasil_api import ibge_api +from brasil_api.api import ibge_api from brasil_api.model.ibgev1 import IBGEV1 from pprint import pprint # Defining the host is optional and defaults to https://brasilapi.com.br/api diff --git a/test/test_banks_api.py b/test/test_banks_api.py index a75ee11..302fe05 100644 --- a/test/test_banks_api.py +++ b/test/test_banks_api.py @@ -11,14 +11,14 @@ import unittest import brasil_api -from brasil-api.banks_api import BANKSApi # noqa: E501 +from brasil_api.api.banks_api import BanksApi # noqa: E501 -class TestBANKSApi(unittest.TestCase): - """BANKSApi unit test stubs""" +class TestBanksApi(unittest.TestCase): + """BanksApi unit test stubs""" def setUp(self): - self.api = BANKSApi() # noqa: E501 + self.api = BanksApi() # noqa: E501 def tearDown(self): pass diff --git a/test/test_cep_api.py b/test/test_cep_api.py index b0d2782..de322c3 100644 --- a/test/test_cep_api.py +++ b/test/test_cep_api.py @@ -11,7 +11,7 @@ import unittest import brasil_api -from brasil-api.cep_api import CEPApi # noqa: E501 +from brasil_api.api.cep_api import CEPApi # noqa: E501 class TestCEPApi(unittest.TestCase): diff --git a/test/test_cep_v2_api.py b/test/test_cep_v2_api.py index 9e0f557..cbf4cd5 100644 --- a/test/test_cep_v2_api.py +++ b/test/test_cep_v2_api.py @@ -11,7 +11,7 @@ import unittest import brasil_api -from brasil-api.cep_v2_api import CEPV2Api # noqa: E501 +from brasil_api.api.cep_v2_api import CEPV2Api # noqa: E501 class TestCEPV2Api(unittest.TestCase): diff --git a/test/test_cnpj_api.py b/test/test_cnpj_api.py index a89d78c..eeeb665 100644 --- a/test/test_cnpj_api.py +++ b/test/test_cnpj_api.py @@ -11,7 +11,7 @@ import unittest import brasil_api -from brasil-api.cnpj_api import CNPJApi # noqa: E501 +from brasil_api.api.cnpj_api import CNPJApi # noqa: E501 class TestCNPJApi(unittest.TestCase): diff --git a/test/test_ddd_api.py b/test/test_ddd_api.py index 4d880a6..342cfbd 100644 --- a/test/test_ddd_api.py +++ b/test/test_ddd_api.py @@ -11,7 +11,7 @@ import unittest import brasil_api -from brasil-api.ddd_api import DDDApi # noqa: E501 +from brasil_api.api.ddd_api import DDDApi # noqa: E501 class TestDDDApi(unittest.TestCase): diff --git a/test/test_feriados_nacionais_api.py b/test/test_feriados_nacionais_api.py index 8f0ebf9..b67daca 100644 --- a/test/test_feriados_nacionais_api.py +++ b/test/test_feriados_nacionais_api.py @@ -11,7 +11,7 @@ import unittest import brasil_api -from brasil-api.feriados_nacionais_api import FeriadosNacionaisApi # noqa: E501 +from brasil_api.api.feriados_nacionais_api import FeriadosNacionaisApi # noqa: E501 class TestFeriadosNacionaisApi(unittest.TestCase): diff --git a/test/test_ibge_api.py b/test/test_ibge_api.py index 9254be2..79b9316 100644 --- a/test/test_ibge_api.py +++ b/test/test_ibge_api.py @@ -11,7 +11,7 @@ import unittest import brasil_api -from brasil-api.ibge_api import IBGEApi # noqa: E501 +from brasil_api.api.ibge_api import IBGEApi # noqa: E501 class TestIBGEApi(unittest.TestCase):