Skip to content

Commit 1121573

Browse files
committed
Test PyPy 3.9, reduce number of Python interpreters in CI pipeline
1 parent 629952c commit 1121573

File tree

5 files changed

+266
-143
lines changed

5 files changed

+266
-143
lines changed

CHANGELOG.rst

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,27 @@
11
Changelog
22
==========
33

4+
1.11
5+
----
6+
7+
.. changelog::
8+
:version: 1.11.0
9+
10+
.. change::
11+
:tags: core, feature
12+
13+
Allow ``setuptools-git-versioning`` script to infer version from ``setup.py`` if ``pyproject.toml`` is missing
14+
15+
.. change::
16+
:tags: core, breaking
17+
18+
Raise error if ``pyproject.toml`` exists, but is not a file
19+
20+
.. change::
21+
:tags: core, feature
22+
23+
Add ``cwd`` argument to most of functions, allowing to get versions a specific repo folder
24+
425
1.10
526
----
627

README.rst

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ and a section ``tool.setuptools-git-versioning`` with config options:
8080
.. code:: toml
8181
8282
[build-system]
83-
requires = [ "setuptools>=41", "wheel", "setuptools-git-versioning", ]
83+
requires = [ "setuptools>=41", "wheel", "setuptools-git-versioning<2", ]
8484
build-backend = "setuptools.build_meta"
8585
8686
[tool.setuptools-git-versioning]
@@ -113,7 +113,7 @@ and then add new argument ``setuptools_git_versioning`` with config options:
113113
setuptools_git_versioning={
114114
"enabled": True,
115115
},
116-
setup_requires=["setuptools-git-versioning"],
116+
setup_requires=["setuptools-git-versioning<2"],
117117
)
118118
119119
And check the package version generated:
@@ -122,3 +122,13 @@ And check the package version generated:
122122
123123
$ python setup.py --version
124124
0.0.1
125+
126+
# or
127+
128+
$ python -m setuptools_git_versioning
129+
0.0.1
130+
131+
# or
132+
133+
$ setuptools-git-versioning
134+
0.0.1

0 commit comments

Comments
 (0)