kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-10-01 08:40:11 +02:00
Code Activity

Merge branch 'python_dist' into 'master'

Browse Source 
Fix l10n broken in venvs, stop packaging makebuildserver script

Closes #1014

See merge request fdroid/fdroidserver!1167
This commit is contained in:
Hans-Christoph Steiner 2023-02-16 21:21:38 +00:00
commit 01bddc98f1
2 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab-ci.yml
View File

@ -159,6 +159,9 @@ ubuntu_jammy_pip:
- export PATH=$PATH:$ANDROID_HOME/build-tools/33.0.0 - export PATH=$PATH:$ANDROID_HOME/build-tools/33.0.0
- fdroid=`which fdroid` ./tests/run-tests - fdroid=`which fdroid` ./tests/run-tests
# check localization was properly installed
- LANGUAGE='de' fdroid --help | grep 'Gültige Befehle sind'
# test installation process on a bleeding edge distro with pip # test installation process on a bleeding edge distro with pip
arch_pip_install: arch_pip_install:

24
setup.py
View File

@ -1,6 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import os
import re import re
import subprocess import subprocess
import sys import sys
@ -50,30 +49,20 @@ class InstallWithCompile(install):
def get_data_files(): def get_data_files():
# workaround issue on OSX or --user installs, where sys.prefix is not an installable location
if os.access(sys.prefix, os.W_OK | os.X_OK):
data_prefix = sys.prefix
else:
data_prefix = '.'
data_files = [] data_files = []
with open('MANIFEST.in') as fp: with open('MANIFEST.in') as fp:
data = fp.read() data = fp.read()
data_files.append( data_files.append(
( ('share/doc/fdroidserver/examples', re.findall(r'include (examples/.*)', data))
data_prefix + '/share/doc/fdroidserver/examples',
['buildserver/config.buildserver.yml']
+ re.findall(r'include (examples/.*)', data),
) )
data_files.append(
('share/doc/fdroidserver/examples', ['buildserver/config.buildserver.yml'])
) )
for f in re.findall( for d in re.findall(r'include (locale/.*)/fdroidserver\.po', data):
r'include (locale/[a-z][a-z][a-zA-Z_]*/LC_MESSAGES/fdroidserver\.)po', data data_files.append(('share/' + d, [d + '/fdroidserver.mo']))
):
f += 'mo'
d = os.path.join(data_prefix, 'share', os.path.dirname(f))
data_files.append((d, [f]))
return data_files return data_files
@ -91,7 +80,6 @@ setup(
url='https://f-droid.org', url='https://f-droid.org',
license='AGPL-3.0', license='AGPL-3.0',
packages=['fdroidserver', 'fdroidserver.asynchronousfilereader'], packages=['fdroidserver', 'fdroidserver.asynchronousfilereader'],
scripts=['makebuildserver'],
entry_points={'console_scripts': ['fdroid=fdroidserver.__main__:main']}, entry_points={'console_scripts': ['fdroid=fdroidserver.__main__:main']},
data_files=get_data_files(), data_files=get_data_files(),
python_requires='>=3.9', python_requires='>=3.9',