Merge branch 'metadata' into 'master'

preserve order and formatting on creating Metadata from Yaml template (closes #352)

Closes #352

See merge request !310

diff --git a/README.md b/README.md
index 32a42eecc0add1b3c839422794b456e35ba71255..88a3d5a97dc2e28058e29db3ea2aec6f89422df1 100644 (file)
--- a/README.md
+++ b/README.md
@@ -5,11 +5,12 @@
 Server for [F-Droid](https://f-droid.org), the Free Software repository system
 for Android.
 
-The F-Droid server tools provide various scripts and tools that are used to
-maintain the main [F-Droid application repository](https://f-droid.org/repository/browse).
-You can use these same tools to create your own additional or alternative
-repository for publishing, or to assist in creating, testing and submitting
-metadata to the main repository.
+The F-Droid server tools provide various scripts and tools that are
+used to maintain the main
+[F-Droid application repository](https://f-droid.org/packages).  You
+can use these same tools to create your own additional or alternative
+repository for publishing, or to assist in creating, testing and
+submitting metadata to the main repository.
 
 For documentation, please see <https://f-droid.org/docs/>, or you can
 find the source for the documentation in
@@ -22,61 +23,14 @@ F-Droid is an installable catalogue of FOSS (Free and Open Source Software)
 applications for the Android platform. The client makes it easy to browse,
 install, and keep track of updates on your device.
 
-### Installing
-
-Note that only Python 3 is supported. We recommend version 3.4 or later.
-
-The easiest way to install the `fdroidserver` tools is on Ubuntu, Mint or other
-Ubuntu based distributions, you can install using:
-
-       sudo apt-get install fdroidserver
-
-For older Ubuntu releases or to get the latest version, you can get
-`fdroidserver` from the Guardian Project PPA (the signing key
-fingerprint is `6B80 A842 07B3 0AC9 DEE2 35FE F50E ADDD 2234 F563`)
-
-       sudo add-apt-repository ppa:guardianproject/ppa
-       sudo apt-get update
-       sudo apt-get install fdroidserver
-
-On OSX, `fdroidserver` is available from third party package managers,
-like Homebrew, MacPorts, and Fink:
-
-       brew install fdroidserver
-
-For Arch-Linux is a package in the AUR available. If you have installed
-`yaourt` or something similiar, you can do:
 
-       yaourt -S fdroidserver
-
-For any platform where Python's `easy_install` is an option (e.g. OSX
-or Cygwin, you can use it:
-
-       sudo easy_install fdroidserver
-
-Python's `pip` also works:
-
-       sudo pip3 install fdroidserver
-
-The combination of `pyvenv` and `pip` is great for testing out the
-latest versions of `fdroidserver`. Using `pip`, `fdroidserver` can
-even be installed straight from git. First, make sure you have
-installed the python header files, venv and pip. They should be
-included in your OS's default package manager or you can install them
-via other mechanisms like Brew/dnf/pacman/emerge/Fink/MacPorts.
-
-For Debian based distributions:
-
-       apt-get install python3-dev python3-pip python3-venv libjpeg-dev zlib1g-dev
+### Installing
 
-Then here's how to install:
+There are many was to install _fdroidserver_, they are documented on
+the website:
+https://f-droid.org/docs/Installing_the_Server_and_Repo_Tools
 
-       git clone https://gitlab.com/fdroid/fdroidserver.git
-       cd fdroidserver
-       pyvenv env/
-       source env/bin/activate
-       pip3 install -e .
-       python3 setup.py install
+All sorts of other documentation lives there as well.
 
 
 ### Drozer Scanner

diff --git a/setup.py b/setup.py
index c1705ed9d76f57ad0c10f5ef6f01f23a3057091b..048b23e61053cb9184e222b96796ef883e03ea81 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -11,21 +11,23 @@ else:
     data_prefix = '.'
 
 setup(name='fdroidserver',
-      version='0.7.0',
+      version='0.8',
       description='F-Droid Server Tools',
       long_description=open('README.md').read(),
       author='The F-Droid Project',
       author_email='team@f-droid.org',
       url='https://f-droid.org',
       packages=['fdroidserver', 'fdroidserver.asynchronousfilereader'],
-      scripts=['fdroid', 'fd-commit'],
+      scripts=['fdroid', 'fd-commit', 'makebuildserver'],
       data_files=[
           (data_prefix + '/share/doc/fdroidserver/examples',
               ['buildserver/config.buildserver.py',
-                  'examples/config.py',
-                  'examples/makebuildserver.config.py',
-                  'examples/opensc-fdroid.cfg',
-                  'examples/fdroid-icon.png']),
+               'examples/config.py',
+               'examples/fdroid-icon.png'
+               'examples/makebuildserver.config.py',
+               'examples/opensc-fdroid.cfg',
+               'examples/public-read-only-s3-bucket-policy.json',
+               'examples/template.yml']),
       ],
       install_requires=[
           'clint',
@@ -43,10 +45,15 @@ setup(name='fdroidserver',
           'docker-py == 1.9.0',
       ],
       classifiers=[
-          'Development Status :: 3 - Alpha',
+          'Development Status :: 4 - Beta',
           'Intended Audience :: Developers',
+          'Intended Audience :: Information Technology',
+          'Intended Audience :: System Administrators',
+          'Intended Audience :: Telecommunications Industry',
           'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
           'Operating System :: POSIX',
+          'Operating System :: MacOS :: MacOS X',
+          'Operating System :: Unix',
           'Topic :: Utilities',
       ],
       )