Skip to content

Commit 37197c2

Browse files
committed
Use correct deps and Azure CI definitions
- Drop Python 3.7 - Drop Appveyor - Drop obsolete Azure OS versions - Update installation requirements to match ScanCode Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
1 parent 59e5f7a commit 37197c2

File tree

3 files changed

+17
-43
lines changed

3 files changed

+17
-43
lines changed

appveyor.yml

-19
This file was deleted.

azure-pipelines.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -11,54 +11,54 @@ jobs:
1111
parameters:
1212
job_name: ubuntu20_cpython
1313
image_name: ubuntu-20.04
14-
python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
14+
python_versions: ['3.8', '3.9', '3.10', '3.11']
1515
test_suites:
1616
all: sudo chmod 0644 /boot/vmlinuz-* && sudo apt install libguestfs-tools && venv/bin/pytest -n 2 -vvs
1717

1818
- template: etc/ci/azure-posix.yml
1919
parameters:
2020
job_name: ubuntu22_cpython
2121
image_name: ubuntu-22.04
22-
python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
22+
python_versions: ['3.8', '3.9', '3.10', '3.11']
2323
test_suites:
2424
all: venv/bin/pytest -n 2 -vvs
2525

2626
- template: etc/ci/azure-posix.yml
2727
parameters:
2828
job_name: macos11_cpython
29-
image_name: macOS-11
30-
python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
29+
image_name: macos-11
30+
python_versions: ['3.8', '3.9', '3.10', '3.11']
3131
test_suites:
3232
all: venv/bin/pytest -n 2 -vvs
3333

3434
- template: etc/ci/azure-posix.yml
3535
parameters:
3636
job_name: macos12_cpython
37-
image_name: macOS-12
38-
python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
37+
image_name: macos-12
38+
python_versions: ['3.8', '3.9', '3.10', '3.11']
3939
test_suites:
4040
all: venv/bin/pytest -n 2 -vvs
4141

4242
- template: etc/ci/azure-posix.yml
4343
parameters:
4444
job_name: macos13_cpython
45-
image_name: macOS-13
46-
python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
45+
image_name: macos-13
46+
python_versions: ['3.8', '3.9', '3.10', '3.11']
4747
test_suites:
4848
all: venv/bin/pytest -n 2 -vvs
4949

5050
- template: etc/ci/azure-win.yml
5151
parameters:
5252
job_name: win2019_cpython
5353
image_name: windows-2019
54-
python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
54+
python_versions: ['3.8', '3.9', '3.10', '3.11']
5555
test_suites:
5656
all: venv\Scripts\pytest -n 2 -vvs
5757

5858
- template: etc/ci/azure-win.yml
5959
parameters:
6060
job_name: win2022_cpython
6161
image_name: windows-2022
62-
python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
62+
python_versions: ['3.8', '3.9', '3.10', '3.11']
6363
test_suites:
6464
all: venv\Scripts\pytest -n 2 -vvs

setup.cfg

+7-14
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@ classifiers =
1616
Intended Audience :: Developers
1717
Programming Language :: Python :: 3
1818
Programming Language :: Python :: 3 :: Only
19-
Programming Language :: Python :: 3.6
20-
Programming Language :: Python :: 3.7
21-
Programming Language :: Python :: 3.8
22-
Programming Language :: Python :: 3.9
23-
Programming Language :: Python :: 3.10
2419
Topic :: Software Development
2520
Topic :: Utilities
2621

@@ -67,16 +62,14 @@ packages = find:
6762
include_package_data = true
6863
zip_safe = false
6964

70-
setup_requires = setuptools_scm[toml] >= 4
71-
7265
python_requires = >=3.7
7366

7467
install_requires =
75-
attrs >= 18.1, !=20.1.0
76-
commoncode >= 30.2.0
77-
plugincode >= 21.1.21
78-
typecode >= 21.6.1
79-
six
68+
attrs >= 18.1,!=20.1.0;python_version<'3.11'
69+
attrs >= 22.1.0;python_version>='3.11'
70+
commoncode >= 31.0.2
71+
plugincode >= 32.0.0
72+
typecode >= 30.0.1
8073

8174
[options.packages.find]
8275
where = src
@@ -86,7 +79,7 @@ where = src
8679
full =
8780
extractcode-7z >= 16.5.210525
8881
extractcode_libarchive >= 3.5.1.210525
89-
typecode[full] >= 30.0.0
82+
typecode[full] >= 30.0.1
9083

9184
patch =
9285
patch >= 1.16
@@ -101,7 +94,7 @@ testing =
10194
isort
10295

10396
docs =
104-
Sphinx>=5.0.2
97+
Sphinx == 5.1.0
10598
sphinx-rtd-theme>=1.0.0
10699
sphinx-reredirects >= 0.1.2
107100
doc8>=0.11.2

0 commit comments

Comments
 (0)