chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
74197a9
)
Switch README and docs to indicate python 3
author
Daniel Martí
<mvdan@mvdan.cc>
Mon, 4 Jan 2016 20:47:37 +0000
(21:47 +0100)
committer
Daniel Martí
<mvdan@mvdan.cc>
Fri, 11 Mar 2016 13:27:00 +0000
(13:27 +0000)
README.md
patch
|
blob
|
history
docs/fdroid.texi
patch
|
blob
|
history
diff --git
a/README.md
b/README.md
index 46dbdb0c8a0ac6f12b5cd45ba30062847eb6a486..44305ed8f41f2576e29f3e38e9e4198247903e6f 100644
(file)
--- a/
README.md
+++ b/
README.md
@@
-23,8
+23,7
@@
install, and keep track of updates on your device.
### Installing
### Installing
-Note that only Python 2 is supported. We recommend version 2.7.7 or
-later.
+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:
The easiest way to install the `fdroidserver` tools is on Ubuntu, Mint or other
Ubuntu based distributions, you can install using:
@@
-56,7
+55,7
@@
or Cygwin, you can use it:
Python's `pip` also works:
Python's `pip` also works:
- sudo pip install fdroidserver
+ sudo pip
3
install fdroidserver
The combination of `virtualenv` and `pip` is great for testing out the
latest versions of `fdroidserver`. Using `pip`, `fdroidserver` can
The combination of `virtualenv` and `pip` is great for testing out the
latest versions of `fdroidserver`. Using `pip`, `fdroidserver` can
@@
-67,7
+66,7
@@
via other mechanisms like Brew/dnf/pacman/emerge/Fink/MacPorts.
For Debian based distributions:
For Debian based distributions:
- apt-get install python
-dev python-pip python
-virtualenv
+ apt-get install python
3-dev python3-pip python3
-virtualenv
Then here's how to install:
Then here's how to install:
@@
-75,5
+74,5
@@
Then here's how to install:
cd fdroidserver
virtualenv env/
source env/bin/activate
cd fdroidserver
virtualenv env/
source env/bin/activate
- pip install -e .
- python
2
setup.py install
+ pip
3
install -e .
+ python
3
setup.py install
diff --git
a/docs/fdroid.texi
b/docs/fdroid.texi
index 6e2434c9abd1ed2b23d47aab25e1a047e3bb3847..29cac7e44aa22f3efefa380c86fb7a57098b958c 100644
(file)
--- a/
docs/fdroid.texi
+++ b/
docs/fdroid.texi
@@
-83,9
+83,7
@@
intended usage. At the very least, you'll need:
@item
GNU/Linux
@item
@item
GNU/Linux
@item
-Python 2.x
-To be sure of being able to process all apk files without error, you need
-2.7.7 or later. See @code{http://bugs.python.org/issue14315}.
+Python 3.4 or later
@item
The Android SDK Tools and Build-tools.
Note that F-Droid does not assume that you have the Android SDK in your
@item
The Android SDK Tools and Build-tools.
Note that F-Droid does not assume that you have the Android SDK in your