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

python3-apeye-core: fixed merge-conflict

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

33
python3-apeye-core/.footprint
View File

@ -1,14 +1,13 @@
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/apeye_core-1.1.3.dist-info/
-rw-r--r-- root/root usr/lib/python3.12/site-packages/apeye_core-1.1.3.dist-info/METADATA
-rw-r--r-- root/root usr/lib/python3.12/site-packages/apeye_core-1.1.3.dist-info/RECORD
-rw-r--r-- root/root usr/lib/python3.12/site-packages/apeye_core-1.1.3.dist-info/WHEEL
drwxr-xr-x root/root usr/lib/python3.12/site-packages/apeye_core-1.1.3.dist-info/licenses/
-rw-r--r-- root/root usr/lib/python3.12/site-packages/apeye_core-1.1.3.dist-info/licenses/LICENSE
drwxr-xr-x root/root usr/lib/python3.12/site-packages/apeye_core-1.1.5.dist-info/
-rw-r--r-- root/root usr/lib/python3.12/site-packages/apeye_core-1.1.5.dist-info/METADATA
-rw-r--r-- root/root usr/lib/python3.12/site-packages/apeye_core-1.1.5.dist-info/RECORD
-rw-r--r-- root/root usr/lib/python3.12/site-packages/apeye_core-1.1.5.dist-info/WHEEL
drwxr-xr-x root/root usr/lib/python3.12/site-packages/apeye_core-1.1.5.dist-info/licenses/
-rw-r--r-- root/root usr/lib/python3.12/site-packages/apeye_core-1.1.5.dist-info/licenses/LICENSE
drwxr-xr-x root/root usr/lib/python3.12/site-packages/apeye_core/
-rw-r--r-- root/root usr/lib/python3.12/site-packages/apeye_core/__init__.py
drwxr-xr-x root/root usr/lib/python3.12/site-packages/apeye_core/__pycache__/
@ -19,23 +18,3 @@ drwxr-xr-x root/root usr/lib/python3.12/site-packages/apeye_core/__pycache__/
-rw-r--r-- root/root usr/lib/python3.12/site-packages/apeye_core/email_validator.py
-rw-r--r-- root/root usr/lib/python3.12/site-packages/apeye_core/public_suffix_list.dat
-rw-r--r-- root/root usr/lib/python3.12/site-packages/apeye_core/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/apeye_core-1.1.5.dist-info/
-rw-r--r-- root/root usr/lib/python3.10/site-packages/apeye_core-1.1.5.dist-info/METADATA
-rw-r--r-- root/root usr/lib/python3.10/site-packages/apeye_core-1.1.5.dist-info/RECORD
-rw-r--r-- root/root usr/lib/python3.10/site-packages/apeye_core-1.1.5.dist-info/WHEEL
drwxr-xr-x root/root usr/lib/python3.10/site-packages/apeye_core-1.1.5.dist-info/licenses/
-rw-r--r-- root/root usr/lib/python3.10/site-packages/apeye_core-1.1.5.dist-info/licenses/LICENSE
drwxr-xr-x root/root usr/lib/python3.10/site-packages/apeye_core/
-rw-r--r-- root/root usr/lib/python3.10/site-packages/apeye_core/__init__.py
drwxr-xr-x root/root usr/lib/python3.10/site-packages/apeye_core/__pycache__/
-rw-r--r-- root/root usr/lib/python3.10/site-packages/apeye_core/__pycache__/__init__.cpython-310.opt-2.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/apeye_core/__pycache__/_tld.cpython-310.opt-2.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/apeye_core/__pycache__/email_validator.cpython-310.opt-2.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/apeye_core/_tld.py
-rw-r--r-- root/root usr/lib/python3.10/site-packages/apeye_core/email_validator.py
-rw-r--r-- root/root usr/lib/python3.10/site-packages/apeye_core/public_suffix_list.dat
-rw-r--r-- root/root usr/lib/python3.10/site-packages/apeye_core/py.typed (EMPTY)
>>>>>>> origin/3.7

11
python3-apeye-core/.signature
View File

@ -1,12 +1,5 @@
untrusted comment: verify with /etc/ports/contrib.pub
<<<<<<< HEAD
RWSagIOpLGJF3+NwtKmtqaf3UYxX+x8ngc/muF1DlocSMg1vKN/+H7XH0LMo25+KiA6M4QX9cJczz9/dXcHmwF4mYsijU6yS0Qc=
SHA256 (Pkgfile) = 389736d059aa3e9ad3f911c77d974c1005693f366a5971cd70ee1123067e9ad6
SHA256 (.footprint) = 525e5200bbacf0f140488208fc56be8b2a7940d51fac43a27c14f574c9e13281
SHA256 (apeye_core-1.1.3.tar.gz) = 9073195c739c4d3f959a5682fed2df7422064aa2fd8e9203ceb1e70644cacec5
=======
RWSagIOpLGJF3/UoDPH0n2B6OFrXYE7HfvA+kPFIHSt1MZtPLKJYrJshBr1pDaO+rqexpk9tiG1TMBZUWlQbM4G13VPzb8/O3Q8=
RWSagIOpLGJF3+++5VCza3zfWhOBZHqskRfdABCubPgHMAcVPR1VWPLh0/LM0sZ+HG6yw9A6nXfooY1v4BPW+1ncL870Q6rnSgA=
SHA256 (Pkgfile) = 37e35fa40fd31438a7898feaa556e9eb98d50f41f803ddd854158b3b0ce25581
SHA256 (.footprint) = 251c3eab400d95c60801e32e7002f7b8c0893ab6ff78fe2c35cc6aa67abba427
SHA256 (.footprint) = b926b4287586b312cb06774d352426f4f74ae3cd3c94aa06f8f9db0e7119721d
SHA256 (apeye_core-1.1.5.tar.gz) = 5de72ed3d00cc9b20fea55e54b7ab8f5ef8500eb33a5368bc162a5585e238a55
>>>>>>> origin/3.7

4
python3-apeye-core/Pkgfile
View File

@ -4,11 +4,7 @@
# Depends on: python3-domdf-python-tools python3-hatch-requirements-txt python3-idna
name=python3-apeye-core
<<<<<<< HEAD
version=1.1.3
=======
version=1.1.5
>>>>>>> origin/3.7
release=1
source=(https://pypi.org/packages/source/a/apeye_core/apeye_core-$version.tar.gz)