5 Commity 042b8f88de ... d8b16815f7

Autor SHA1 Wiadomość Data
  Grace Past d8b16815f7 Merging from 2017.7 7 lat temu
  Grace Past bf1b407e8c Actually create the wheel to upload... 7 lat temu
  Grace Past 5e0166694c Last July release! 7 lat temu
  Grace Past 574c132f6b Edit Changelog 7 lat temu
  Grace Past b66c3c1db5 Debian 9 is FIXED! 7 lat temu
4 zmienionych plików z 17 dodań i 3 usunięć
  1. 4 0
      Patches/Files/ChangeLog
  2. 6 1
      Patches/Files/README.md
  3. 1 1
      Patches/Perm/g13
  4. 6 1
      series.sh

+ 4 - 0
Patches/Files/ChangeLog

@@ -1,3 +1,7 @@
+2017.7.139:
+*Add publication to PyPI
+*Enhance apt metadata
+
 2017.7.67:
 *Fix bugs in apt repository install/documentation
 

+ 6 - 1
Patches/Files/README.md

@@ -23,6 +23,10 @@ To install it right away for all users on an apt-based system, add our apt repos
 Finally, install apt\-transport\-https, update your apt database, and install avideo:
 
     sudo apt install apt-transport-https && sudo apt update && sudo apt install avideo
+    
+You can alternatively install the Python package directly, using pip:
+
+    sudo pip install avideo
 
 Otherwise, or if you would like to install from source, download the source tarball. Extract it, and then run the following in a terminal:
 
@@ -704,6 +708,8 @@ If you've followed [our manual installation instructions](#installation) for apt
 
 If you have installed youtube-dl using a package manager like *apt-get* or *yum*, use the standard system update mechanism to update. Distribution packages may be outdated.
 
+For installations made using pip, the command `sudo pip install -U avideo` will update to the latest version.
+
 As a last resort, you can also uninstall the version installed by your package manager and follow our manual installation instructions. For that, remove the distribution's package, with a line like
 
     sudo apt-get remove -y youtube-dl
@@ -877,7 +883,6 @@ If you want to create a build of youtube-dl yourself, you'll need
 * python
 * make (only GNU make is supported)
 * pandoc
-* zip
 * nosetests
 
 For information on contributing, please see the [Developer Documentation](https://rg3.github.io/youtube-dl/Developer+Documentation).

+ 1 - 1
Patches/Perm/g13

@@ -1,9 +1,9 @@
 #Makefile: Wheel, release and executable zipfile creation
+	python setup.py sdist bdist_wheel
 	
 pub: BINFILES/youtube-dl.deb BINFILES/youtube-dl.tar.gz pypi-files
 	mv BINFILES/youtube-dl.tar.gz BINFILES/youtube_dl-`devscripts/version.sh -r`.tar.gz
 	mv BINFILES/youtube-dl.deb BINFILES/youtube_dl-`devscripts/version.sh -r`.deb
-	python setup.py sdist bdist_wheel upload
 	
 libu2d: youtube_dl/*.py youtube_dl/*/*.py
 

+ 6 - 1
series.sh

@@ -106,6 +106,11 @@ function release_pub {
 	SERIES_CURRENT=`echo $version | awk -F . ' { print $1"."$2 } '`
 	echo "Building Release Packages..."
 	make pub
+	#Upload to PyPI
+	gpg -ab dist/*.tar.gz
+	twine upload dist/* *.tar.gz.asc
+	rm *.tar.gz.asc
+	#Done Upload
 	mv BINFILES/ ../../
 	echo "Publishing Files..."
 	cd ..
@@ -150,7 +155,7 @@ function release_pub {
 		apt-ftparchive release . >> Release
 		rm Packages
 		gpg --clearsign -o InRelease Release
-		gpg -abs -o Release.gpg Release
+		gpg -ab -o Release.gpg Release
 		git add Packages.gz Release.gpg InRelease Release
 		cd ..
 	done