Page Menu
Home
Solus
Search
Configure Global Search
Log In
Files
F11023371
D9990.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
4 KB
Referenced Files
None
Subscribers
None
D9990.diff
View Options
diff --git a/files/0001-Fix-versioning.patch b/files/0001-Fix-versioning.patch
new file mode 100644
--- /dev/null
+++ b/files/0001-Fix-versioning.patch
@@ -0,0 +1,37 @@
+From cdff3d76be6a76ad272b387068ce46cf936820af Mon Sep 17 00:00:00 2001
+From: Algent Albrahimi <algent@protonmail.com>
+Date: Thu, 12 Nov 2020 20:31:12 +0100
+Subject: [PATCH] Fix versioning
+
+---
+ pyproject.toml | 4 +---
+ setup.py | 2 +-
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index 6ee7df2..82ff2d4 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -1,8 +1,6 @@
+ [build-system]
+-requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=3.4.1"]
++requires = ["setuptools>=41.2.0", "wheel", "setuptools_scm[toml]>=3.4.1"]
+ build-backend = "setuptools.build_meta"
+
+ [tool.black]
+ skip-string-normalization = true
+-
+-[tool.setuptools_scm]
+diff --git a/setup.py b/setup.py
+index bac24a4..827e955 100644
+--- a/setup.py
++++ b/setup.py
+@@ -3,4 +3,4 @@
+ import setuptools
+
+ if __name__ == "__main__":
+- setuptools.setup()
++ setuptools.setup(use_scm_version=True)
+--
+2.29.2
+
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
name : python-keyring
version : 21.4.0
-release : 8
+release : 9
source :
- https://files.pythonhosted.org/packages/source/k/keyring/keyring-21.4.0.tar.gz : 9aeadd006a852b78f4b4ef7c7556c2774d2432bbef8ee538a3e9089ac8b11466
license :
@@ -23,6 +23,8 @@
- python-importlib-metadata
- python-secretstorage
setup : |
+ %patch -p1 < $pkgfiles/0001-Fix-versioning.patch
+
# We don't have pytest-black and pytest-mypy in the repo
sed -i 's/ --black//; s/ --mypy//' pytest.ini
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -21,12 +21,12 @@
<PartOf>programming.python</PartOf>
<Files>
<Path fileType="executable">/usr/bin/keyring</Path>
- <Path fileType="library">/usr/lib/python3.7/site-packages/keyring-0.0.0-py3.7.egg-info/PKG-INFO</Path>
- <Path fileType="library">/usr/lib/python3.7/site-packages/keyring-0.0.0-py3.7.egg-info/SOURCES.txt</Path>
- <Path fileType="library">/usr/lib/python3.7/site-packages/keyring-0.0.0-py3.7.egg-info/dependency_links.txt</Path>
- <Path fileType="library">/usr/lib/python3.7/site-packages/keyring-0.0.0-py3.7.egg-info/entry_points.txt</Path>
- <Path fileType="library">/usr/lib/python3.7/site-packages/keyring-0.0.0-py3.7.egg-info/requires.txt</Path>
- <Path fileType="library">/usr/lib/python3.7/site-packages/keyring-0.0.0-py3.7.egg-info/top_level.txt</Path>
+ <Path fileType="library">/usr/lib/python3.7/site-packages/keyring-21.4.0-py3.7.egg-info/PKG-INFO</Path>
+ <Path fileType="library">/usr/lib/python3.7/site-packages/keyring-21.4.0-py3.7.egg-info/SOURCES.txt</Path>
+ <Path fileType="library">/usr/lib/python3.7/site-packages/keyring-21.4.0-py3.7.egg-info/dependency_links.txt</Path>
+ <Path fileType="library">/usr/lib/python3.7/site-packages/keyring-21.4.0-py3.7.egg-info/entry_points.txt</Path>
+ <Path fileType="library">/usr/lib/python3.7/site-packages/keyring-21.4.0-py3.7.egg-info/requires.txt</Path>
+ <Path fileType="library">/usr/lib/python3.7/site-packages/keyring-21.4.0-py3.7.egg-info/top_level.txt</Path>
<Path fileType="library">/usr/lib/python3.7/site-packages/keyring/__init__.py</Path>
<Path fileType="library">/usr/lib/python3.7/site-packages/keyring/__main__.py</Path>
<Path fileType="library">/usr/lib/python3.7/site-packages/keyring/__pycache__/__init__.cpython-37.pyc</Path>
@@ -78,8 +78,8 @@
</Files>
</Package>
<History>
- <Update release="8">
- <Date>2020-09-27</Date>
+ <Update release="9">
+ <Date>2020-11-13</Date>
<Version>21.4.0</Version>
<Comment>Packaging update</Comment>
<Name>Algent Albrahimi</Name>
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Wed, Aug 9, 1:01 PM (22 h, 24 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5805370
Default Alt Text
D9990.diff (4 KB)
Attached To
Mode
D9990: Fix versioning for python-keyring
Attached
Detach File
Event Timeline
Log In to Comment