Merge branch 'release/0.4.0'
* release/0.4.0: bump version number, update changelog change devdocs to Jessie add requirements file for Jessie
This commit is contained in:
		
						commit
						2ac63391af
					
				
					 5 changed files with 26 additions and 5 deletions
				
			
		| 
						 | 
					@ -1,3 +1,6 @@
 | 
				
			||||||
 | 
					2015-02-20  Jan Dittberner  <jan@dittberner.info>
 | 
				
			||||||
 | 
						* add Jessie requirements file
 | 
				
			||||||
 | 
					
 | 
				
			||||||
2014-10-14  Jan Dittberner  <jan@dittberner.info>
 | 
					2014-10-14  Jan Dittberner  <jan@dittberner.info>
 | 
				
			||||||
	* add patch by Paul Wise to use to update DUCK link to new static page
 | 
						* add patch by Paul Wise to use to update DUCK link to new static page
 | 
				
			||||||
	* add patch by Paul Wise to remove generated files from version
 | 
						* add patch by Paul Wise to remove generated files from version
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -46,14 +46,14 @@ master_doc = 'index'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# General information about the project.
 | 
					# General information about the project.
 | 
				
			||||||
project = u'Debian Member Portfolio Service'
 | 
					project = u'Debian Member Portfolio Service'
 | 
				
			||||||
copyright = u'2009-2014, Jan Dittberner'
 | 
					copyright = u'2009-2015, Jan Dittberner'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# The version info for the project you're documenting, acts as replacement for
 | 
					# The version info for the project you're documenting, acts as replacement for
 | 
				
			||||||
# |version| and |release|, also used in various other places throughout the
 | 
					# |version| and |release|, also used in various other places throughout the
 | 
				
			||||||
# built documents.
 | 
					# built documents.
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# The short X.Y version.
 | 
					# The short X.Y version.
 | 
				
			||||||
version = '0.3.3'
 | 
					version = '0.4.0'
 | 
				
			||||||
# The full version, including alpha/beta/rc tags.
 | 
					# The full version, including alpha/beta/rc tags.
 | 
				
			||||||
release = version
 | 
					release = version
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -44,12 +44,12 @@ requirements using `pip <https://pypi.python.org/pypi/pip>`_::
 | 
				
			||||||
  virtualenv --distribute ~/.virtualenvs/dmportfolio
 | 
					  virtualenv --distribute ~/.virtualenvs/dmportfolio
 | 
				
			||||||
  . ~/.virtualenvs/dmportfolio/bin/activate
 | 
					  . ~/.virtualenvs/dmportfolio/bin/activate
 | 
				
			||||||
  cd ~/src/debianmemberportfolio
 | 
					  cd ~/src/debianmemberportfolio
 | 
				
			||||||
  pip install -r wheezyreq.pip
 | 
					  pip install -r jessiereq.pip
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.. note::
 | 
					.. note::
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  The Debian Member Portfolio Service instance at http://portfolio.debian.net/
 | 
					  The Debian Member Portfolio Service instance at http://portfolio.debian.net/
 | 
				
			||||||
  is running on a Debian Wheezy server, therefore :file:`wheezyreq.pip`
 | 
					  is running on a Debian Jessie server, therefore :file:`jessiereq.pip`
 | 
				
			||||||
  contains dependency versions matching that Debian release.
 | 
					  contains dependency versions matching that Debian release.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
The dependency download and installation into the virtual environment takes
 | 
					The dependency download and installation into the virtual environment takes
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										18
									
								
								jessiereq.pip
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										18
									
								
								jessiereq.pip
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,18 @@
 | 
				
			||||||
 | 
					Babel==1.3
 | 
				
			||||||
 | 
					Beaker==1.6.4
 | 
				
			||||||
 | 
					FormEncode==1.2.6
 | 
				
			||||||
 | 
					Mako==1.0.0
 | 
				
			||||||
 | 
					MarkupSafe==0.23
 | 
				
			||||||
 | 
					Paste==1.7.5.1
 | 
				
			||||||
 | 
					PasteDeploy==1.5.2
 | 
				
			||||||
 | 
					PasteScript==1.7.5
 | 
				
			||||||
 | 
					Pygments==2.0.1
 | 
				
			||||||
 | 
					Pylons==1.0.1
 | 
				
			||||||
 | 
					Routes==2.0
 | 
				
			||||||
 | 
					Tempita==0.5.2
 | 
				
			||||||
 | 
					WebError==0.10.3
 | 
				
			||||||
 | 
					WebHelpers==1.3
 | 
				
			||||||
 | 
					WebOb==1.4
 | 
				
			||||||
 | 
					WebTest==2.0.16
 | 
				
			||||||
 | 
					nose==1.3.4
 | 
				
			||||||
 | 
					simplejson==3.6.5
 | 
				
			||||||
							
								
								
									
										2
									
								
								setup.py
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								setup.py
									
										
									
									
									
								
							| 
						 | 
					@ -28,7 +28,7 @@ except ImportError:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
setup(
 | 
					setup(
 | 
				
			||||||
    name='debianmemberportfolio',
 | 
					    name='debianmemberportfolio',
 | 
				
			||||||
    version='0.3.3',
 | 
					    version='0.4.0',
 | 
				
			||||||
    description='service to create Debian Member Portfolio URLs',
 | 
					    description='service to create Debian Member Portfolio URLs',
 | 
				
			||||||
    long_description="""This is a service implementation that returns a set of
 | 
					    long_description="""This is a service implementation that returns a set of
 | 
				
			||||||
    personalized URLs as outlined in https://wiki.debian.org/DDPortfolio. It
 | 
					    personalized URLs as outlined in https://wiki.debian.org/DDPortfolio. It
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue