Skip to content

Commit 6569ad8

Browse files
committed
prep for 2.0.0alpha0 release.
Initial set of changes for the release. Still a few files to change.
1 parent cbb881c commit 6569ad8

File tree

9 files changed

+157
-77
lines changed

9 files changed

+157
-77
lines changed

COPYING.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Note links for http://www.zope.com/Marks and http://www.ekit.com/ are dead.
33
Roundup Licensing
44
-----------------
55

6-
Copyright (c) 2009-2018 Roundup-Team
6+
Copyright (c) 2009-2019 Roundup-Team
77
Copyright (c) 2003-2009 Richard Jones ([email protected])
88
Copyright (c) 2002 eKit.com Inc (http://www.ekit.com/)
99
Copyright (c) 2001 Bizar Software Pty Ltd (http://www.bizarsoftware.com.au/)

RELEASE.txt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,11 @@ Roundup release checklist:
2828
_tmp/linkcheck/output.txt
2929
fix broken references in docs
3030
verify redirects are correct
31-
5. Update setup.py info if needed (contacts, classifiers, etc.), and
32-
check that metadata is valid and long descriptions is proper reST:
31+
5. Update setup.py info if needed (contacts, classifiers, etc.). When
32+
releasing check that Development Status matches release: stable,
33+
beta alpha etc.
34+
35+
Check that metadata is valid and long descriptions is proper reST:
3336
python setup.py check --restructuredtext --metadata --strict
3437
6. Clean out all *.orig, *.rej, .#* files from the source.
3538
7. Remove previous build files
@@ -78,7 +81,8 @@ Roundup release checklist:
7881
http://www.roundup-tracker.org/ should state that the stable
7982
version is the one that you released.
8083
http://www.roundup-tracker.org/docs.html should also match the
81-
released version (or atleast the major 1.x release.
84+
released version (or at least the major non pre-release
85+
1.x/2.x version).
8286

8387
So, those commands in a nice, cut'n'pasteable form::
8488

@@ -94,7 +98,7 @@ So, those commands in a nice, cut'n'pasteable form::
9498
cd ..
9599
python setup.py sdist --manifest-only
96100
python setup.py sdist --quiet
97-
python setup.py bdist_rpm
101+
## python setup.py bdist_rpm
98102
# not required for pypi.org since 2017 -> python setup.py register
99103
python setup.py sdist upload --repository pypi --sign
100104

doc/acknowledgements.txt

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,59 @@ ideas and everything else that helped!
1010

1111
.. _`Announcement with changelog for current release.`: announcement.html
1212

13-
2.X
13+
2.0
1414
---
1515

16+
2.0.0a0
17+
~~~~~~~
18+
19+
Maintainer: Ralf Schlatterbeck, John Rouillard
20+
21+
Release Manager: John Rouillard
22+
23+
Developer activity by changesets::
24+
25+
[email protected] 13674 ***************************************************************************************
26+
[email protected] 4746 ******************************
27+
[email protected] 3622 ***********************
28+
[email protected] 3374 *********************
29+
[email protected] 2871 ******************
30+
31+
32+
33+
martin.v.loewis 8
34+
35+
36+
37+
38+
Other contributers
39+
40+
Chau Nguyen,
41+
Andreas (anrounham14),
42+
Robert Klonner
1643
Garth Jensen
1744

1845
1.6
1946
---
2047

48+
1.6.1
49+
~~~~~
50+
Maintainer: Ralf Schlatterbeck, John Rouillard
51+
52+
Release Manager: John Rouillard
53+
54+
Developer activity by changesets::
55+
56+
rouilj at ieee.org 19 *********************************************
57+
bernhard at intevation.de 1 **
58+
jsm at polyomino.org.uk 1 **
59+
60+
61+
Joseph Myers,
62+
Cédric Krier,
63+
hannob/JulienPalard
64+
65+
2166
1.6.0
2267
~~~~~
2368
Maintainer: Ralf Schlatterbeck, John Rouillard

doc/developers.txt

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,19 @@ roundup user.
6262
The configuration is in the "website/issues" section of Roundup's
6363
Mercurical SCM repository and copied manually to the live tracker.
6464

65+
* get a working copy of roundup/website/issues from the SCM, either via
66+
hg clone https://hg.code.sf.net/p/roundup/code
67+
or download a snapshot:
68+
https://sourceforge.net/p/roundup/code/ci/default/tarball
69+
70+
* check the differences
71+
diff -ur /srv/roundup/trackers/roundup/ roundup/website/issues/
72+
73+
Copy differences using 'sudo -u roundup ...'.
74+
75+
Getting a user account
76+
~~~~~~~~~~~~~~~~~~~~~~
77+
6578
To get access to the host, submit a pull request for:
6679

6780
https://github.com/python/psf-salt
@@ -166,7 +179,7 @@ from source. Roundup binary distribution includes MO files only.
166179
.. _GNU gettext:
167180

168181
GNU gettext package
169-
^^^^^^^^^^^^^^^^^^^
182+
~~~~~~~~~~~~~~~~~~~
170183

171184
This chapter is full of references to GNU `gettext package`_.
172185
GNU gettext is a "must have" for nearly all steps of internationalizing
@@ -185,7 +198,7 @@ runtime tools and libraries. In such cases gettext development tools
185198
are usually distributed in separate package named ``gettext-devel``.
186199

187200
Marking Strings for Translation
188-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
201+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
189202

190203
Strings that need translation must be marked in the source code.
191204
Following subsections explain how this is done in different cases.

doc/upgrading.txt

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Contents:
2020
.. contents::
2121
:local:
2222

23-
Migrating from 1.6.0 to x.y.0
23+
Migrating from 1.6.X to 2.0.0
2424
=============================
2525

2626
Upgrade tracker's config.ini file
@@ -33,7 +33,30 @@ to generate a new ini file preserving all your settings. You can then
3333
merge any local comments from the tracker's ``config.ini`` into
3434
``new_init_file.ini``. Compare the old and new files and configure set
3535
any new settings as you want. Then replace ``config.ini`` with the new
36-
init file.
36+
ini file.
37+
38+
Python 3 support
39+
----------------
40+
41+
Many of the ``.html`` and ``.py`` files from Roundup that are copied
42+
into tracker directories have changed for Python 3 support. If you
43+
wish to move an existing tracker to Python 3, you need to merge in
44+
those changes. If your tracker uses the ``anydbm`` or ``mysql``
45+
backends, you also need to export the tracker contents using
46+
``roundup-admin export`` running under Python 2, and them import them
47+
using ``roundup-admin import`` running under Python 3, as for a
48+
migration to a different backend. If using the ``sqlite`` backend,
49+
you do not need to export and import, but need to delete the
50+
``db/otks`` and ``db/sessions`` files when changing Python version.
51+
If using the ``postgresql`` backend, you do not need to export and
52+
import and no other special database-related steps are needed.
53+
54+
Octal values in config.ini change from the python 2 representation
55+
with a leading ``0`` (``022``). They now use a leading ``0o``
56+
(``0o22``). Note that the ``0o`` format is properly handled under
57+
python 2. You can use the ``newfile.ini`` generated using
58+
``python3 roundup-admin ... updateconfig newfile.ini``
59+
if you want to go back to using python 2.
3760

3861
PGP mail processing
3962
-------------------
@@ -88,29 +111,6 @@ or::
88111
if db.tx_Source in ['web', 'rest', 'xmlrpc', 'email-sig-openpgp', 'cli' ]:
89112

90113

91-
Python 3 support
92-
----------------
93-
94-
Many of the ``.html`` and ``.py`` files from Roundup that are copied
95-
into tracker directories have changed for Python 3 support. If you
96-
wish to move an existing tracker to Python 3, you need to merge in
97-
those changes. If your tracker uses the ``anydbm`` or ``mysql``
98-
backends, you also need to export the tracker contents using
99-
``roundup-admin export`` running under Python 2, and them import them
100-
using ``roundup-admin import`` running under Python 3, as for a
101-
migration to a different backend. If using the ``sqlite`` backend,
102-
you do not need to export and import, but need to delete the
103-
``db/otks`` and ``db/sessions`` files when changing Python version.
104-
If using the ``postgresql`` backend, you do not need to export and
105-
import and no other special database-related steps are needed.
106-
107-
Octal values in config.ini change from the python 2 representation
108-
with a leading ``0`` (``022``). They now use a leading ``0o``
109-
(``0o22``). Note that the ``0o`` format is properly handled under
110-
python 2. You can use the ``newfile.ini`` generated using
111-
``python3 roundup-admin ... updateconfig newfile.ini``
112-
if you want to go back to using python 2.
113-
114114
Migrating from 1.5.1 to 1.6.0
115115
=============================
116116

website/README.txt

Lines changed: 49 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,44 @@
11
Roundup has three web sites:
22

33
* http://www.roundup-tracker.org/
4-
* http://wiki.roundup-tracker.org/
4+
* https://wiki.roundup-tracker.org/
55
* https://issues.roundup-tracker.org/
66

77
www and wiki are hosted on SourceForge.
88

99

1010
updating issues.roundup-tracker.org
1111
===================================
12-
If you don't have access, ask to update on mailing list. You may try to
13-
ping Ralf, Bernhard or Ezio directly.
14-
15-
* log into issues.roundup-tracker.org
16-
* get a working copy of roundup/website/issues from the SCM, either via
17-
hg clone http://hg.code.sf.net/p/roundup/code
18-
or download a snapshot:
19-
http://sourceforge.net/p/roundup/code/ci/default/tarball
20-
21-
* check the differences
22-
diff -ur /home/roundup/trackers/roundup/ /home/YOURUSERID/roundup/website/issues/
23-
* copy the files into the tracker instance, using sudo:
24-
sudo -u roundup cp <file> /home/roundup/trackers/roundup/...
25-
or use rsync to check and only copy the changed files as user roundup like
26-
rsync -rvc /home/YOURUSERID/roundup/website/issues/ trackers/roundup/
27-
HINT: old files will not be deleted by this rsync command
28-
* restart the roundup server:
29-
sudo /etc/init.d/roundup restart
30-
31-
32-
updating services hosted on sf.net (www and wiki)
12+
See doc/developers.txt for details on accessing the new location.
13+
14+
15+
updating wiki.roundup-tracker.org
16+
=================================
17+
Wiki isn't hosted on sourceforge anymore. See:
18+
19+
https://issues.roundup-tracker.org/issue2551045
20+
21+
for details on Implementing wiki move to Waldmann-EDV.
22+
23+
Bern Reiter will be adding new docs on how to update files (if
24+
possible). Old directions are:
25+
26+
=============
27+
28+
copy new files over to new directories:
29+
30+
cd ${project_home}/src/roundup/website/wiki
31+
cp -r -p static/roundup ${project_home}/htdocs/_wiki/
32+
cp -p wiki/data/plugin/theme/roundup.py ${project_home}/persistent/wiki/data/plugin/theme/
33+
cd -
34+
35+
If you need to adjust wiki configuration, it is here:
36+
37+
vim persistent/wiki/wikiconfig.py
38+
39+
==============
40+
41+
updating services hosted on sf.net (www)
3342
=================================================
3443
Generic SF instructions for web service recommend
3544
uploading files through SFTP, described here:
@@ -79,22 +88,6 @@ to free resources:
7988

8089
shutdown
8190

82-
updating wiki.roundup-tracker.org
83-
---------------------------------
84-
wiki doesn't require building anything, so if you're
85-
logged in to SF (see above), just copy new files over
86-
to new directories:
87-
88-
cd ${project_home}/src/roundup/website/wiki
89-
cp -r -p static/roundup ${project_home}/htdocs/_wiki/
90-
cp -p wiki/data/plugin/theme/roundup.py ${project_home}/persistent/wiki/data/plugin/theme/
91-
cd -
92-
93-
If you need to adjust wiki configuration, it is here:
94-
95-
vim persistent/wiki/wikiconfig.py
96-
97-
9891
updating www.roundup-tracker.org
9992
---------------------------------
10093
Site update requires rebuilding HTML files. For that
@@ -118,3 +111,21 @@ the whole procedure looks like so:
118111
cp -r -p ../../doc/html_extra/* ${project_home}/htdocs/docs/
119112
# or try it with rsync (skip --dry-run when ready)
120113
#rsync --dry-run -v --checksum --recursive ./html/* ${project_home}/htdocs/
114+
115+
116+
If you are relasing an alpha/beta arelease, don't update:
117+
118+
${project_home}/htdocs/docs/
119+
120+
instead update:
121+
122+
${project_home}/htdocs/dev-docs/
123+
124+
and the URL will be: http://www.roundup-tracker.org/dev-docs/docs.html
125+
126+
Note there appears to be a cache somewhere in the path, so you may
127+
need to use:
128+
129+
http://www.roundup-tracker.org/dev-docs/docs.html?foo=1
130+
131+
to cache bust.

website/www/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@
5252
# built documents.
5353
#
5454
# The short X.Y version.
55-
version = '1.6'
55+
version = '2.0'
5656
# The full version, including alpha/beta/rc tags.
57-
release = '1.6'
57+
release = '2.0.0alpha0'
5858

5959
# The language for content autogenerated by Sphinx. Refer to documentation
6060
# for a list of supported languages.

website/www/docs.txt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,16 @@ Docs
1111
docs/user_guide
1212
docs/customizing
1313
docs/admin_guide
14+
docs/debugging
1415
docs/xmlrpc
15-
Design (original) <docs/design>
16-
docs/developers
16+
docs/rest
1717
docs/tracker_templates
18+
docs/glossary
1819
docs/acknowledgements
1920
docs/license
21+
Design Overview <docs/overview>
22+
Design (original) <docs/design>
23+
docs/developers
24+
Notes about the MySQL Database backend <docs/mysql>
25+
Notes about the PostgreSQL Database backend <docs/postgresql>
26+
Richard Jones implementation notes <docs/implementation>

website/www/index.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Roundup Issue Tracker
88
Roundup is a simple-to-use and -install issue-tracking system with command-line, web and e-mail interfaces.
99
It is based on the winning design from Ka-Ping Yee in the Software Carpentry "Track" design competition.
1010

11-
The current stable version of Roundup is 1.6 which has quite a comprehensive
11+
The current <strike>stable</strike> version of Roundup is 2.0.0alpha0 which has quite a comprehensive
1212
:doc:`feature set <docs/features>`. For more information see the :doc:`design overview <docs/design>`,
1313
and all the other :doc:`documentation <docs>`. Roundup has been deployed for:
1414

@@ -30,5 +30,5 @@ Roundup was originally released as version 0.1.1 in late August, 2001. The first
3030
Got tired of waiting for Roundup to be released. Had just finished major product project, so needed
3131
something different for a while. Roundup here I come...
3232

33-
.. _`download`: http://cheeseshop.python.org/pypi/roundup
33+
.. _`download`: https://pypi.org/project/roundup/
3434
.. _`change note`: https://sourceforge.net/p/roundup/code/ci/tip/tree/CHANGES.txt

0 commit comments

Comments
 (0)