Skip to content

Commit

Permalink
Update dependencies and requirements (#12)
Browse files Browse the repository at this point in the history
* Bump dependencies
* Use pytest instead of nose
* Move python version requirement to 3.11
  • Loading branch information
BolZer authored Jul 26, 2023
1 parent 2834aa2 commit 903fe54
Show file tree
Hide file tree
Showing 13 changed files with 43 additions and 75 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up Python 3.7
- name: Set up Python 3.11
uses: actions/setup-python@v1
with:
python-version: 3.7
python-version: 3.11
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/static_type_checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up Python 3.7
- name: Set up Python 3.11
uses: actions/setup-python@v1
with:
python-version: 3.7
python-version: 3.11
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Python Tests 3.7 (nosetests)
name: Python Tests 3.11 (pytest)
on:
push:
branches:
Expand All @@ -12,13 +12,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Install Python 3.7
- name: Install Python 3.11
uses: actions/setup-python@v1
with:
python-version: 3.7
python-version: 3.11
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
- name: Run tests with nosetests
run: nosetests
- name: Run tests with pytest
run: python -m pytest .
24 changes: 0 additions & 24 deletions .github/workflows/tests_3.8.yml

This file was deleted.

24 changes: 0 additions & 24 deletions .github/workflows/tests_3.9.yml

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ venv.bak/
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
.idea
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/dictionaries
Expand Down
7 changes: 5 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
test:
nosetests
python -m pytest .

build:
python setup.py sdist

build_and_upload_test:
python setup.py sdist && twine check dist/* && twine upload --repository testpypi dist/*

build_and_upload:
python setup.py sdist && twine upload dist/*
python setup.py sdist && twine check dist/* && twine upload dist/*

static_type_checker:
mypy --ignore-missing-imports ./easybill_rest/resources/ ./easybill_rest/__init__.py ./easybill_rest/helper.py
Expand Down
5 changes: 5 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
CHANGELOG
=========
* 0.4.0 (2023-07-26)
* Change Python Version requirement to 3.11
* Switch from nose to pytest
* Bump dependencies with security issues

* 0.3.2 (2023-05-31)
* Fixed an issue with the setup.py breaking installation from pypi

Expand Down
2 changes: 1 addition & 1 deletion easybill_rest/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@


class Client:
_version: str = "0.3.2"
_version: str = "0.4.0"
_base_url: str = "https://api.easybill.de"
_requests = requests

Expand Down
4 changes: 2 additions & 2 deletions easybill_rest/tests/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
class TestClient(unittest.TestCase, EasybillRestTestCaseAbstract):

def test_client_version(self) -> None:
self.assertEqual('0.3.2', Client('')._version)
self.assertEqual('0.4.0', Client('')._version)

def test_client_base_url(self) -> None:
self.assertEqual('https://api.easybill.de', Client('')._base_url)
Expand Down Expand Up @@ -95,7 +95,7 @@ def test_client_call_using_right_format(self) -> None:

header = {
'Authorization': 'Bearer Test',
'User-Agent': 'py-ebrest 0.3.2',
'User-Agent': 'py-ebrest 0.4.0',
'Content-type': 'application/json'
}

Expand Down
2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# easybill_rest (py-ebrest)
[![Generic badge](https://img.shields.io/badge/Version-0.3.2-important.svg)]()
[![Generic badge](https://img.shields.io/badge/Version-0.4.0-important.svg)]()
[![Generic badge](https://img.shields.io/badge/coverage-97%25-success.svg)]()
![PyPI - Python Version](https://img.shields.io/pypi/pyversions/easybill_rest.svg)
[![Generic badge](https://img.shields.io/badge/License-MIT-blue.svg)]()
Expand Down
19 changes: 12 additions & 7 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,26 +1,30 @@
astroid==2.9.0
astroid==2.15.4
autopep8==1.6.0
bleach==4.0.0
certifi==2022.12.7
certifi==2023.7.22
charset-normalizer==2.0.4
colorama==0.4.4
docopt==0.6.2
docutils==0.17.1
idna==3.2
importlib-metadata==4.6.3
iniconfig==2.0.0
isort==5.10.1
keyring==23.0.1
lazy-object-proxy==1.6.0
mccabe==0.6.1
mypy==0.910
mypy-extensions==0.4.3
nose==1.3.7
packaging==21.0
pipreqs==0.4.13
pkginfo==1.7.1
platformdirs==2.4.0
pluggy==1.2.0
pycodestyle==2.8.0
Pygments==2.9.0
pylint==2.12.1
Pygments==2.15.0
pylint==2.17.4
pyparsing==2.4.7
pytest==7.4.0
readme-renderer==29.0
requests==2.31.0
requests-toolbelt==0.9.1
Expand All @@ -30,8 +34,9 @@ toml==0.10.2
tqdm==4.62.0
twine==3.4.2
types-requests==2.26.1
typing-extensions==4.0.0
typing_extensions==4.0.0
urllib3==1.26.6
webencodings==0.5.1
wrapt==1.13.3
wrapt==1.15.0
yarg==0.1.9
zipp==3.5.0
12 changes: 7 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,19 @@
url="https://github.com/BolZer/py-ebrest",
packages=setuptools.find_packages(),
classifiers=[
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.11",
"License :: OSI Approved :: MIT License",
],
python_requires='>=3.7.0',
version="0.3.2",
python_requires='>=3.11.0',
version="0.4.0",
install_requires=[
"requests",
"nose<2",
],
extras_require={
'dev': [
"coverage<5",
"wheel",
]})
"pytest<8",
]
}
)

0 comments on commit 903fe54

Please sign in to comment.