more changes to prep for 1.6 release.

replace old url's for pypi with new ones.
fix restrucured text in announce.txt, fix typos.
change licensing to include 2018
remove bdist_windist directions. pypi doesn't accept .exe anymore
updated directions for using pypi

Author: rouilj

COPYING.txt

@@ -1,7 +1,7 @@
 Roundup Licensing
 -----------------
 
-Copyright (c) 2009-2016 Roundup-Team
+Copyright (c) 2009-2018 Roundup-Team
 Copyright (c) 2003-2009 Richard Jones ([email protected])
 Copyright (c) 2002 eKit.com Inc (http://www.ekit.com/)
 Copyright (c) 2001 Bizar Software Pty Ltd (http://www.bizarsoftware.com.au/)

RELEASE.txt

@@ -12,6 +12,7 @@ Roundup release checklist:
       CHANGES.txt
       roundup/__init__.py
       website/www/index.txt
+2a. Update license end date in COPYING.txt
 3.  Update documentation
       doc/announcement.txt
       doc/upgrading.txt
@@ -33,22 +34,24 @@ Roundup release checklist:
 10. python setup.py sdist
     (if you find sdist a little verbose, add "--quiet" to the end of the
      command)
-11. Unpack the new dist file in /tmp then
-      a) run_test.py
+11. Unpack the new tarball created in dist/roundup-<version>.tar.gz
+    file in /tmp then
+      a) run_tests.py
       b) demo.py
     with all available Python versions.
 12. Assuming all is well tag the release in the version-control system.
-13. Build binary packages (requires python 2.6 or newer for
-    bdist_windist to have the --user-access flag.)
-      python setup.py bdist_rpm
-      python setup.py bdist_wininst --user-access-control force
-14. Upload source distributive to PyPI
-      python setup.py sdist upload --sign
-    It should appear on http://pypi.python.org/pypi/roundup in no time.
-15. Send doc/announcement.txt to [email protected] and
+13. Upload source distributive to PyPI - requires you sign up for a
+    pypi account and be added as a maintainer to roundup. Ask existing
+    maintainer for access.
+      python setup.py sdist upload --repository pypi --sign
+    It should appear on http://pypi.python.org/pypi/roundup in no
+    time. If you are using python older than 2.7.13 you need a
+    .pypi rc shown below. URL has changed. If using 2.7.13 or newer,
+    you can remove the "--repository pypi" option.
+14. Send doc/announcement.txt to [email protected] and
     [email protected] and
     [email protected]
-16. Refresh website.
+15. Refresh website.
       website/README.txt
       http://www.roundup-tracker.org/ should state that the stable
       version is the one that you released.
@@ -66,13 +69,30 @@ So, those commands in a nice, cut'n'pasteable form::
  python setup.py sdist --manifest-only
  python setup.py sdist --quiet
  python setup.py bdist_rpm
- python2.5 setup.py bdist_wininst --user-access-control force
- python setup.py register
- python setup.py sdist upload --sign
- python2.5 setup.py bdist_wininst upload --sign
+ # not required for pypi.org since 2017 -> python setup.py register
+ python setup.py sdist upload --repository pypi --sign
 
-(if the last two fail make sure you're using python2.5+)
-Note that python2.6 won't correctly create a bdist_wininst install on
-Linux (it will produce a .exe with "linux" in the name). 2.7 still has
-this bug (Ralf)
+Note pypi no longer allows uploads of .exe installers such as produced
+by bdist_wininst. Removed directions for producing the binary
+distribution.
+
+If you get errors on the upload operation, you may need the following
+~/.pypirc file as well
+
+========
+[distutils]
+index-servers =
+    test
+    pypi
+
+[pypi]
+repository: https://upload.pypi.org/legacy/
+username: <your username on pypi.org here>
+password: <your password here>
+
+[test]
+repository: https://test.pypi.org/legacy/
+username: <your username on test.pypi.org here>
+password: <your password here>
+========
 

doc/announcement.txt

@@ -42,7 +42,8 @@ Features:
   otherwise they will clash with the "hidden" input elements generated by
   indexargs_form itself.
 
-  For example:
+  For example::
+
     <tal:block replace="structure python:request.indexargs_form(
                       sort=0,group=0,filter=0,columns=0,
                       exclude=['type','status','assignedto'])"/>
@@ -82,9 +83,9 @@ Features:
   quiet=True/False option for all property types. When quiet=True
   changes to the property will not be displayed in the::
 
-    confirmation banner (shown in green) when a change is made
-    property change section of change note (nosy emails)
-    web history display for an item.
+    * confirmation banner (shown in green) when a change is made
+    * property change section of change note (nosy emails)
+    * web history display for an item.
 
   Note that this may confuse users if used on a property that is
   meant to be changed by a user. It is most useful on administrative
@@ -94,9 +95,9 @@ Features:
 
     http://psf.upfronthosting.co.za/roundup/meta/issue249
 
-  Support for setting quiet when calling the class specifiers::
+  Support for setting quiet when calling the class specifiers.
+  E.G. prop=String(quiet=True) rather than::
 
-    E.G. prop=String(quiet=True) rather than::
       prop=String()
       prop.quiet=True
 
@@ -106,7 +107,7 @@ Features:
   changed while implementing fix for issue2550864. Filtering of
   quiet properties pushed down to the hyperdb.py::Class::history
   function. This fixes a small bug in the implementation that caused
-  a limiting the templating history call to display fewer than the
+  a limiting the templating history call to display fewer than
   the requested number of items if some were quiet.)
 - issue2550767: Add newitemcopy.py detector to notify users of new
   items.  Added to detectors directory and a README.txt generated to
@@ -140,7 +141,7 @@ Features:
   Change to classic tracker template to provide a check box (checked
   by default) that keeps the user on the "Add new keyword" page after
   submitting a new keyword. Usually after submission, you will see the
-  the page for the new keyword to allow you to change the name of the
+  page for the new keyword to allow you to change the name of the
   keyword. (John Rouillard)
 - issue2550757 - internal restructuring to allow admin.py to be tested
   more easily. W. Trevor King (wking)/ John Rouillard.
@@ -293,7 +294,7 @@ Fixed:
   pagesize is not propigated to the prev link. This patch fixes that.
   Patch provided by John Kristensen. (Applied, light testing by John
   Rouillard.)
-- issue2550850 anypy/email_.py uses BSPACE which is not defined in python 2.7
+- issue2550850 anypy/email\_.py uses BSPACE which is not defined in python 2.7
   Supplied a definition for BSPACE since it seems to not be defined
   anywhere. Reported by Dennis Boone. (John Rouillard)
 - Validate properties specified for sorting and grouping in index
@@ -390,7 +391,7 @@ Fixed:
   db/text-index: already locked. Put in a retry loop that will attempt
   to get the lock. Total delay approx 4.5 seconds. (John Rouillard)
 - issue2550727: db.newid is broken with sqlite. Added proper transaction
-  lock around the sql code to get a new id. The the locking
+  lock around the sql code to get a new id. The locking
   that pysqlite attempts had to be defeated because it is broken.
   Had to explicitly manage transactions with BEGIN IMMEDIATE and call
   sql_commit. Note that this reduces performance in return for accuracy.
@@ -533,7 +534,7 @@ To give Roundup a try, just download (see below), unpack and run::
     python demo.py
 
 Release info and download page:
-     http://pypi.python.org/pypi/roundup
+     http://pypi.org/project/roundup
 Source and documentation is available at the website:
      http://roundup-tracker.org/
 Mailing lists - the place to ask questions:
@@ -566,11 +567,11 @@ though an install script is provided.
 
 It comes with five issue tracker templates
 
- * a classic bug/feature tracker
- * a minimal skeleton;
- * a more extensive devel tracker for bug/features etc.
- * a responsive version of the devel tracker
- * a jinja2 based template based on devel
+* a classic bug/feature tracker
+* a minimal skeleton;
+* a more extensive devel tracker for bug/features etc.
+* a responsive version of the devel tracker
+* a jinja2 based template based on devel
 
 and four database back-ends (anydbm, sqlite, mysql and postgresql).
 

doc/customizing.txt

@@ -2023,7 +2023,7 @@ recommended for production use.
 .. _Chameleon:
    http://chameleon.repoze.org/
 .. _z3c.pt:
-   http://pypi.python.org/pypi/z3c.pt
+   https://pypi.org/project/z3c.pt/
 __ http://chameleon.repoze.org/docs/latest/reference.html#incompatibilities-and-differences
 .. _TAL:
 .. _Template Attribute Language:

doc/installation.txt

@@ -118,11 +118,11 @@ Windows Service
 
 .. _Xapian: http://xapian.org/
 .. _Whoosh: https://bitbucket.org/mchaput/whoosh/wiki/Home
-.. _pytz: http://www.python.org/pypi/pytz
+.. _pytz: https://pypi.org/project/pytz/
 .. _Olson tz database: http://www.twinsun.com/tz/tz-link.htm
 .. _pyopenssl: http://pyopenssl.sourceforge.net
 .. _pyme: http://pyme.sourceforge.net
-.. _pywin32: http://pypi.python.org/pypi/pywin32
+.. _pywin32: https://pypi.org/project/pywin32/
 .. _jinja2: http://jinja.pocoo.org/
 
 
@@ -1113,7 +1113,7 @@ from installation and scripts.
 .. _External hyperlink targets:
 
 .. _apache: http://httpd.apache.org/
-.. _flup: http://pypi.python.org/pypi/flup
+.. _flup: https://pypi.org/project/flup/
 .. _mod_python: http://www.modpython.org/
 .. _MySQLdb: http://sourceforge.net/projects/mysql-python
 .. _Psycopg: http://initd.org/software/initd/psycopg