Skip to content

Commit f37bec2

Browse files
committed
Merge latest skeleton
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
2 parents 41a820b + f46bc48 commit f37bec2

3 files changed

Lines changed: 9 additions & 6 deletions

File tree

configure.bat

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
@echo OFF
22
@setlocal
3-
@rem Copyright (c) nexB Inc. and others.
4-
@rem SPDX-License-Identifier: Apache-2.0
3+
@rem Copyright (c) nexB Inc. http://www.nexb.com/ - All rights reserved.
54

65
@rem ################################
76
@rem # A configuration script for Windows
@@ -90,7 +89,6 @@ call mkdir "%CFG_ROOT_DIR%tmp"
9089
call curl -o "%CFG_ROOT_DIR%tmp\virtualenv.pyz" https://bootstrap.pypa.io/virtualenv.pyz
9190
call %PYTHON_EXECUTABLE% "%CFG_ROOT_DIR%tmp\virtualenv.pyz" "%CFG_ROOT_DIR%tmp"
9291
call "%CFG_ROOT_DIR%tmp\Scripts\activate"
93-
@rem call "%CFG_ROOT_DIR%tmp\Scripts\pip" install --upgrade pip virtualenv setuptools wheel
9492
call "%CFG_ROOT_DIR%tmp\Scripts\pip" install -e .[testing] -e .[full]
9593

9694
@rem Return a proper return code on failure

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[build-system]
2-
requires = ["setuptools >= 44", "wheel", "setuptools_scm[toml] >= 4"]
2+
requires = ["setuptools >= 50", "wheel", "setuptools_scm[toml] >= 4"]
33
build-backend = "setuptools.build_meta"
44

55
[tool.setuptools_scm]

setup.cfg

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,10 @@ full =
5151

5252
testing =
5353
saneyaml
54-
pytest >= 4
55-
pytest-xdist >= 1
54+
# upstream
55+
pytest >= 6
56+
pytest-xdist >= 2
57+
docs=
58+
Sphinx>=3.3.1
59+
sphinx-rtd-theme>=0.5.0
60+
doc8>=0.8.1

0 commit comments

Comments
 (0)