ports/contrib
3
3
Fork 3
Code Issues Pull Requests Activity

python3-dom-toml: fixed merge-conflict

Browse Source
This commit is contained in:
Tim Biermann 2024-05-16 20:10:27 +02:00
parent eaeea6ef85
commit 60c43ccfbf
Signed by: tb
GPG Key ID: 42F8B4E30B673606
3 changed files with 7 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
python3-dom-toml/.footprint
View File

@ -1,13 +1,12 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/lib/
<<<<<<< HEAD
drwxr-xr-x root/root usr/lib/python3.12/
drwxr-xr-x root/root usr/lib/python3.12/site-packages/
drwxr-xr-x root/root usr/lib/python3.12/site-packages/dom_toml-0.6.1.dist-info/
-rw-r--r-- root/root usr/lib/python3.12/site-packages/dom_toml-0.6.1.dist-info/LICENSE
-rw-r--r-- root/root usr/lib/python3.12/site-packages/dom_toml-0.6.1.dist-info/METADATA
-rw-r--r-- root/root usr/lib/python3.12/site-packages/dom_toml-0.6.1.dist-info/RECORD
-rw-r--r-- root/root usr/lib/python3.12/site-packages/dom_toml-0.6.1.dist-info/WHEEL
drwxr-xr-x root/root usr/lib/python3.12/site-packages/dom_toml-2.0.0.dist-info/
-rw-r--r-- root/root usr/lib/python3.12/site-packages/dom_toml-2.0.0.dist-info/LICENSE
-rw-r--r-- root/root usr/lib/python3.12/site-packages/dom_toml-2.0.0.dist-info/METADATA
-rw-r--r-- root/root usr/lib/python3.12/site-packages/dom_toml-2.0.0.dist-info/RECORD
-rw-r--r-- root/root usr/lib/python3.12/site-packages/dom_toml-2.0.0.dist-info/WHEEL
drwxr-xr-x root/root usr/lib/python3.12/site-packages/dom_toml/
-rw-r--r-- root/root usr/lib/python3.12/site-packages/dom_toml/__init__.py
drwxr-xr-x root/root usr/lib/python3.12/site-packages/dom_toml/__pycache__/
@ -19,23 +18,3 @@ drwxr-xr-x root/root usr/lib/python3.12/site-packages/dom_toml/__pycache__/
-rw-r--r-- root/root usr/lib/python3.12/site-packages/dom_toml/encoder.py
-rw-r--r-- root/root usr/lib/python3.12/site-packages/dom_toml/parser.py
-rw-r--r-- root/root usr/lib/python3.12/site-packages/dom_toml/py.typed (EMPTY)
=======
drwxr-xr-x root/root usr/lib/python3.10/
drwxr-xr-x root/root usr/lib/python3.10/site-packages/
drwxr-xr-x root/root usr/lib/python3.10/site-packages/dom_toml-2.0.0.dist-info/
-rw-r--r-- root/root usr/lib/python3.10/site-packages/dom_toml-2.0.0.dist-info/LICENSE
-rw-r--r-- root/root usr/lib/python3.10/site-packages/dom_toml-2.0.0.dist-info/METADATA
-rw-r--r-- root/root usr/lib/python3.10/site-packages/dom_toml-2.0.0.dist-info/RECORD
-rw-r--r-- root/root usr/lib/python3.10/site-packages/dom_toml-2.0.0.dist-info/WHEEL
drwxr-xr-x root/root usr/lib/python3.10/site-packages/dom_toml/
-rw-r--r-- root/root usr/lib/python3.10/site-packages/dom_toml/__init__.py
drwxr-xr-x root/root usr/lib/python3.10/site-packages/dom_toml/__pycache__/
-rw-r--r-- root/root usr/lib/python3.10/site-packages/dom_toml/__pycache__/__init__.cpython-310.opt-2.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/dom_toml/__pycache__/decoder.cpython-310.opt-2.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/dom_toml/__pycache__/encoder.cpython-310.opt-2.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/dom_toml/__pycache__/parser.cpython-310.opt-2.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/dom_toml/decoder.py
-rw-r--r-- root/root usr/lib/python3.10/site-packages/dom_toml/encoder.py
-rw-r--r-- root/root usr/lib/python3.10/site-packages/dom_toml/parser.py
-rw-r--r-- root/root usr/lib/python3.10/site-packages/dom_toml/py.typed (EMPTY)
>>>>>>> origin/3.7

11
python3-dom-toml/.signature
View File

@ -1,12 +1,5 @@
untrusted comment: verify with /etc/ports/contrib.pub
<<<<<<< HEAD
RWSagIOpLGJF331eplwMQad1j+gtC+aX3imd4Fg/mlAsIdbG5S5qqIsaxcjqcQYo3lawOwwOdtEOT5mpQEdGjY66VIEx75tDZwo=
SHA256 (Pkgfile) = ab806c8ac9af58a1fad806f1d26059e811af01a82952af6d475f5ca1e0b8abbd
SHA256 (.footprint) = 1abf4cf4823bd85be78edeab2cc7906fd8f84148671a107fc17962ae5c572cbf
SHA256 (dom_toml-0.6.1.tar.gz) = a0bfc204ae32c72ed36e526dce56108a3b20741ac3c055207206ce3b2f302868
=======
RWSagIOpLGJF38aUfK+uB8qSVeo+W+7UPld0X7FVgSW+J9AB2WtCWv3PBLHY0GImm2AwoHwtz0KU4U6DT297+46tHGfwd4zHOQk=
RWSagIOpLGJF32EJAQHAlagypcmSM4nyBPzX1hn9Wy8LByqYylQpqGY2R9zCUz7CwRlu/PWSYqRIClz0Vk2KDpeTq04Hd+jibgg=
SHA256 (Pkgfile) = 0b53382aaccc77a8283d5b8581a2495ed59cdfa8d26304670806de73af728f46
SHA256 (.footprint) = 9f551dd93fcca5e713671750e2165a1eb3661102add20aa2771520129cbdd065
SHA256 (.footprint) = 96f41a94ffff493435d183332e684f122d2c2927f473b64bf23bf531bfcbe0ed
SHA256 (dom_toml-2.0.0.tar.gz) = 3c07e8436538994974127b1ae037661d1a779ac915c44fd06b3ab5fe140ff589
>>>>>>> origin/3.7

4
python3-dom-toml/Pkgfile
View File

@ -4,11 +4,7 @@
# Depends on: python3-domdf-python-tools python3-toml python3-wheel
name=python3-dom-toml
<<<<<<< HEAD
version=0.6.1
=======
version=2.0.0
>>>>>>> origin/3.7
release=1
source=(https://pypi.org/packages/source/d/dom_toml/dom_toml-$version.tar.gz)