diff --git a/CONTRIBUTORS b/CONTRIBUTORS --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1,24 +1,27 @@ List of contributors to Kallithea project: + Dominik Ruf 2012 2014-2018 + Thomas De Schampheleire 2014-2018 + Branko Majic 2015 2018 + Mads Kiilerich 2016-2018 Mads Kiilerich 2012-2017 Unity Technologies 2012-2017 Andrew Shadura 2012 2014-2017 - Dominik Ruf 2012 2014-2017 - Thomas De Schampheleire 2014-2017 + Étienne Gilli 2015-2017 Søren Løvborg 2015-2017 Sam Jaques 2015 2017 Asterios Dimitriou 2016-2017 - Mads Kiilerich 2016-2017 Alessandro Molina 2017 Anton Schur 2017 Ching-Chen Mao 2017 Eivind Tagseth 2017 FUJIWARA Katsunori 2017 + Holger Schramm 2017 Karl Goetz 2017 + Lars Kruse 2017 Marko Semet 2017 Viktar Vauchkevich 2017 Takumi IINO 2012-2016 - Étienne Gilli 2015-2016 Jan Heylen 2015-2016 Robert Martinez 2015-2016 Robert Rauch 2015-2016 @@ -40,7 +43,6 @@ List of contributors to Kallithea projec Andrew Bartlett 2015 Balázs Úr 2015 Ben Finney 2015 - Branko Majic 2015 Daniel Hobley 2015 David Avigni 2015 Denis Blanchette 2015 diff --git a/MANIFEST.in b/MANIFEST.in --- a/MANIFEST.in +++ b/MANIFEST.in @@ -12,6 +12,7 @@ include development.ini include pytest.ini include requirements.txt include tox.ini +include package.json recursive-include docs * recursive-include init.d * recursive-include kallithea/alembic * diff --git a/kallithea/templates/about.html b/kallithea/templates/about.html --- a/kallithea/templates/about.html +++ b/kallithea/templates/about.html @@ -24,11 +24,13 @@ necessarily limited to the following:

    -
  • Copyright © 2012–2017, Mads Kiilerich
    • +
  • Copyright © 2012–2018, Mads Kiilerich
    • +
  • Copyright © 2012, 2014–2018, Dominik Ruf
    • +
  • Copyright © 2014–2018, Thomas De Schampheleire
    • +
  • Copyright © 2015, 2018, Branko Majic
  • Copyright © 2012–2017, Unity Technologies
  • Copyright © 2012, 2014–2017, Andrew Shadura
    • -
  • Copyright © 2012, 2014–2017, Dominik Ruf
    • -
  • Copyright © 2014–2017, Thomas De Schampheleire
    • +
  • Copyright © 2015–2017, Étienne Gilli
  • Copyright © 2015–2017, Søren Løvborg
  • Copyright © 2015, 2017, Sam Jaques
  • Copyright © 2016–2017, Asterios Dimitriou
    • @@ -37,11 +39,12 @@
  • Copyright © 2017, Ching-Chen Mao
  • Copyright © 2017, Eivind Tagseth
  • Copyright © 2017, FUJIWARA Katsunori
    • +
  • Copyright © 2017, Holger Schramm
  • Copyright © 2017, Karl Goetz
    • +
  • Copyright © 2017, Lars Kruse
  • Copyright © 2017, Marko Semet
  • Copyright © 2017, Viktar Vauchkevich
  • Copyright © 2012–2016, Takumi IINO
    • -
  • Copyright © 2015–2016, Étienne Gilli
  • Copyright © 2015–2016, Jan Heylen
  • Copyright © 2015–2016, Robert Martinez
  • Copyright © 2015–2016, Robert Rauch
    • @@ -63,7 +66,6 @@
  • Copyright © 2015, Andrew Bartlett
  • Copyright © 2015, Balázs Úr
  • Copyright © 2015, Ben Finney
    • -
  • Copyright © 2015, Branko Majic
  • Copyright © 2015, Daniel Hobley
  • Copyright © 2015, David Avigni
  • Copyright © 2015, Denis Blanchette
    • diff --git a/kallithea/templates/base/base.html b/kallithea/templates/base/base.html --- a/kallithea/templates/base/base.html +++ b/kallithea/templates/base/base.html @@ -23,7 +23,7 @@ Kallithea, %endif which is - © 2010–2017 by various authors & licensed under GPLv3. + © 2010–2018 by various authors & licensed under GPLv3. %if c.issues_url: – ${_('Support')} %endif diff --git a/kallithea/tests/other/test_vcs_operations.py b/kallithea/tests/other/test_vcs_operations.py --- a/kallithea/tests/other/test_vcs_operations.py +++ b/kallithea/tests/other/test_vcs_operations.py @@ -609,7 +609,7 @@ class TestVCSOperations(TestController): # clone repo clone_url = webserver.repo_url(testfork[repo_type], username=TEST_USER_ADMIN_LOGIN, password=TEST_USER_ADMIN_PASS) dest_dir = _get_tmp_dir() - stdout, stderr = Command(TESTS_TMP_PATH)\ + stdout, stderr = Command(TESTS_TMP_PATH) \ .execute('%s clone' % repo_type, clone_url, dest_dir, ignoreReturnCode=True) if repo_type == 'hg': assert 'preoutgoing.testhook hook failed' in stdout diff --git a/scripts/make-release b/scripts/make-release --- a/scripts/make-release +++ b/scripts/make-release @@ -2,60 +2,71 @@ set -e set -x -echo "Checking tools needed for uploading stuff" -pip freeze | grep '^Sphinx==' || pip install Sphinx -pip freeze | grep '^Sphinx-PyPI-upload==' || pip install Sphinx-PyPI-upload +echo "Install/verify tools needed for building and uploading stuff" +pip install --upgrade -e . +pip install --upgrade -r dev_requirements.txt Sphinx Sphinx-PyPI-upload + +echo "Cleanup and update copyrights ... and clean checkout" +scripts/run-all-cleanup +scripts/update-copyrights.py +hg up -cr . -echo "Verifying everything can build" -hg purge --all dist -python2 setup.py build_sphinx -python2 setup.py compile_catalog # TODO: check for errors +echo "Make release build from clean checkout in build/" +rm -rf build dist +hg archive build +cd build + +echo "Check MANIFEST.in" +sed -e 's/[^ ]*[ ]*\([^ ]*\).*/\1/g' MANIFEST.in | grep -v '^node_modules/bootstrap\|^kallithea/public/css/style.css' | xargs ls -lad + +echo "Build dist" +python2 setup.py compile_catalog python2 setup.py sdist -echo "Verifying VERSION from kallithea/__init__.py" +echo "Verify VERSION from kallithea/__init__.py" namerel=$(cd dist && echo Kallithea-*.tar.gz) namerel=${namerel%.tar.gz} version=${namerel#Kallithea-} +ls -l $(pwd)/dist/$namerel.tar.gz echo "Releasing Kallithea $version in directory $namerel" -echo "Verifying current revision is tagged for $version" -hg log -r "'$version'&." | grep . -echo "Cleaning before making release build" -hg up -c . -hg revert -a -r null -hg up -C "'$version'&." -hg purge --all +echo "Verify dist file content" +diff -u <((hg mani | grep -v '^\.hg') | LANG=C sort) <(tar tf dist/Kallithea-$version.tar.gz | sed "s|^$namerel/||" | grep . | grep -v '^kallithea/i18n/.*/LC_MESSAGES/kallithea.mo$\|^Kallithea.egg-info/\|^PKG-INFO$\|/$' | LANG=C sort) +! tar tf dist/Kallithea-$version.tar.gz | grep "$namerel/node_modules/bootstrap/\$" + +echo "Verify docs build" +python2 setup.py build_sphinx # not used yet ... but we want to make sure it builds + +cat - << EOT -echo "Building dist file" -python2 setup.py compile_catalog -python2 setup.py sdist - -echo "Verifying dist file content" -diff -u <(hg mani | grep -v '^\.hg' | LANG=C sort) <(tar tf dist/Kallithea-*.tar.gz | sed "s|^$namerel/||" | grep . | grep -v '^kallithea/i18n/.*/LC_MESSAGES/kallithea.mo$\|^Kallithea.egg-info/\|^PKG-INFO$\|/$' | LANG=C sort) +Now, make sure +* the copyright and contributor lists have been updated +* all tests are passing +* release note is ready +* announcement is ready +* source has been pushed to https://kallithea-scm.org/repos/kallithea -echo "Now, make sure" -echo "* the copyright and contributor lists have been updated" -echo "* all tests are passing" -echo "* release note is ready" -echo "* announcement is ready" -echo "* source has been pushed to https://kallithea-scm.org/repos/kallithea" -echo +EOT + +echo "Verify current revision is tagged for $version" +hg log -r "'$version'&." | grep . echo -n "Enter \"pypi\" to upload Kallithea $version to pypi: " read answer [ "$answer" = "pypi" ] -extraargs=${EMAIL:+--identity=$EMAIL} -python2 setup.py sdist upload --sign $extraargs -xdg-open https://pypi.python.org/pypi/Kallithea -echo "Uploading docs to pypi" +echo "Upload docs to pypi" # See https://wiki.python.org/moin/PyPiDocumentationHosting python2 setup.py build_sphinx upload_sphinx xdg-open https://pythonhosted.org/Kallithea/ xdg-open http://packages.python.org/Kallithea/installation.html -echo "Rebuilding readthedocs for docs.kallithea-scm.org" +echo "Rebuild readthedocs for docs.kallithea-scm.org" xdg-open https://readthedocs.org/projects/kallithea/ curl -X POST http://readthedocs.org/build/kallithea xdg-open https://readthedocs.org/builds/kallithea/ xdg-open http://docs.kallithea-scm.org/en/latest/ # or whatever the branch is + +extraargs=${EMAIL:+--identity=$EMAIL} +python2 setup.py sdist upload --sign $extraargs +xdg-open https://pypi.python.org/pypi/Kallithea