Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: move dev requirements to a dedicated file #41

Merged
merged 1 commit into from
Aug 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['2.7', '3.6', '3.7', '3.8', '3.9', '3.10']
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
fail-fast: true

name: Lint on Python ${{ matrix.python-version }}
Expand All @@ -21,15 +21,15 @@ jobs:

- name: Lint
run: |
pip install '.[linting]'
pip install -r dev-requirements.in
flake8 requests_ntlm2
bandit -r requests_ntlm2
test:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: ['2.7', '3.6', '3.7', '3.8', '3.9', '3.10']
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
fail-fast: true

name: Test on Python ${{ matrix.python-version }}
Expand All @@ -42,7 +42,7 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Test
run: |
pip install '.[testing]'
pip install -r dev-requirements.in .
python -m tests.test_server &> /dev/null &
pytest -xv --ignore=tests/functional/test_functional.py --ignore=tests/test_server.py --cov requests_ntlm2 --cov-report term-missing tests
Expand All @@ -59,7 +59,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: '2.7'
python-version: '3.7'
- name: Build package
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
run: |
Expand Down
3 changes: 3 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#### [6.5.3](https://github.com/dopstar/requests-ntlm2/releases/tag/6.5.2) - 01 Aug 2023
- moved development requirements from `setup.py` to `dev-requirements.in` - https://github.com/dopstar/requests-ntlm2/pull/41

#### [6.5.2](https://github.com/dopstar/requests-ntlm2/releases/tag/6.5.2) - 24 Oct 2022
- reworked draining the response socket when establishing proxy tunnelling - https://github.com/dopstar/requests-ntlm2/pull/39

Expand Down
15 changes: 15 additions & 0 deletions dev-requirements.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
bandit; python_version != '2.7'
bandit==1.6.2; python_version == '2.7'
codecov
coverage
faker
flake8
flake8-isort==4.1.1; python_version == '2.7'
flake8-isort; python_version != '2.7'
flake8-quotes
flask
mock
pytest
pytest-cov
trustme==0.7.0
wheel
26 changes: 2 additions & 24 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from setuptools import setup


version = "6.5.2"
version = "6.5.3"
url = "https://github.com/dopstar/requests-ntlm2"

if "a" in version:
Expand All @@ -23,35 +23,12 @@
"six>=1.10",
]

testing_requirements = [
"flask",
"pytest",
"pytest-cov",
"wheel",
"codecov",
"coverage",
"mock",
"faker",
"trustme==0.7.0",
]

linting_requirements = [
"flake8",
"bandit==1.6.2; python_version == '2.7'",
"bandit; python_version != '2.7'",
"flake8-isort==4.1.1; python_version == '2.7'",
"flake8-isort; python_version != '2.7'",
"flake8-quotes",
]


setup(
name="requests_ntlm2",
version=version,
packages=["requests_ntlm2"],
install_requires=requirements,
tests_require=testing_requirements,
extras_require={"testing": testing_requirements, "linting": linting_requirements},
author="Mkhanyisi Madlavana",
author_email="[email protected]",
url=url,
Expand Down Expand Up @@ -81,6 +58,7 @@
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"License :: OSI Approved :: ISC License (ISCL)",
"Operating System :: MacOS",
"Operating System :: POSIX :: Linux",
Expand Down
Loading