Skip to content

Commit

Permalink
Merge pull request #119 from isi-mfurer/loose-attrs
Browse files Browse the repository at this point in the history
setup.py: loosen attrs dependency
  • Loading branch information
isi-mfurer authored Jul 6, 2022
2 parents d81285f + 9412a90 commit 0399f02
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 14 deletions.
12 changes: 4 additions & 8 deletions .github/workflows/test_samba.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
max-parallel: 5
matrix:
python-version: [2.7, 3.6, 3.7, 3.8, 3.9, 3.10-dev]
python-version: [2.7, 3.6, 3.7, 3.8, 3.9, "3.10"]

services:
samba:
Expand All @@ -29,15 +29,11 @@ jobs:

steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
if: "!endsWith(matrix.python-version, '-dev')"
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- uses: deadsnakes/[email protected]
if: endsWith(matrix.python-version, '-dev')
with:
python-version: ${{ matrix.python-version }}
- run: python --version --version && which python
- run: python --version && which python
- run: pip install -U pip && pip --version && which pip
- name: Install Pike
run: pip install .
- name: Install pytest
Expand Down
4 changes: 3 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
[build-system]
requires = ["setuptools>=30.3.0", "wheel", "setuptools_scm"]
requires = ["setuptools>=30.3.0", "wheel", "setuptools_scm[toml]"]

[tool.setuptools_scm]
6 changes: 1 addition & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,6 @@ def run_setup(with_extensions):
setup(
name="pike-smb2",
use_scm_version=True,
setup_requires=[
'setuptools_scm==5.0.2; python_version ~= "2.7"',
'setuptools_scm; python_version >= "3.6"',
],
description="Pure python SMB client",
long_description_content_type='text/markdown',
long_description=long_description,
Expand All @@ -117,7 +113,7 @@ def run_setup(with_extensions):
python_requires=">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*",
install_requires=[
'enum34~=1.1.6; python_version ~= "2.7"',
'attrs~=19.3.0',
"attrs >= 19.3",
"pycryptodomex",
"future",
"six",
Expand Down

0 comments on commit 0399f02

Please sign in to comment.