From a3b15792cf47ba153f337d8997bcbd22c194347e Mon Sep 17 00:00:00 2001
From: Marc Masdeu <marc.masdeu@gmail.com>
Date: Wed, 19 Jul 2017 20:16:06 -0400
Subject: [PATCH 01/14] Added support for cython, also added dependency on
 sagemath package.

---
 .travis-test.sh                  |  1 +
 .travis.yml                      |  4 +-
 README.rst                       | 76 ++++++++++++++++----------------
 sage_sample/ultimate_question.py |  3 +-
 setup.py                         | 27 +++++++++++-
 5 files changed, 70 insertions(+), 41 deletions(-)

diff --git a/.travis-test.sh b/.travis-test.sh
index 910faf4..453c716 100755
--- a/.travis-test.sh
+++ b/.travis-test.sh
@@ -4,6 +4,7 @@
 # notice and this notice are preserved.  This file is offered as-is,
 # without any warranty.
 set -e
+$HOME/SageMath/sage -pip install --upgrade --no-index -v sagemath # Check that Sage is installed
 $HOME/SageMath/sage -pip install --upgrade --no-index -v .
 $HOME/SageMath/sage setup.py test
 (cd docs && $HOME/SageMath/sage -sh -c "make html")
diff --git a/.travis.yml b/.travis.yml
index c725191..8c09eec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,9 @@
 language: python
 matrix:
   include:
-  - env: CACHE_NAME=7.6 DEPLOY_DOC_FROM_BRANCH=master DEPLOY_DOC_TO_DIRECTORY=/ SAGE_SERVER=http://mirrors.xmission.com/sage/ SAGE_IMAGE=linux/64bit/sage-7.6-Ubuntu_12.04-x86_64.tar.bz2
+  - env: CACHE_NAME=7.6 DEPLOY_DOC_FROM_BRANCH=master DEPLOY_DOC_TO_REPOSITORY=username/sample_sage
+     DEPLOY_DOC_TO_DIRECTORY=doc/html SAGE_SERVER=http://mirrors.xmission.com/sage/ SAGE_IMAGE=linux/64bit/sage-7.6-Ubuntu_12.04-x86_64.tar.bz2
+  allow_failures:
   - env: CACHE_NAME=7.5.1 SAGE_SERVER=http://mirrors.xmission.com/sage/ SAGE_IMAGE=linux/64bit/sage-7.5.1-Ubuntu_12.04-x86_64.tar.bz2
 install:
 - ./.travis-install.sh
diff --git a/README.rst b/README.rst
index da8ec40..253a0d1 100644
--- a/README.rst
+++ b/README.rst
@@ -47,7 +47,7 @@ Setup
 ------
 
 All packaging setup is done through ``setup.py``. To create your own package
-follow the strcuture of the file and change the parameters accordingly.
+follow the structure of the file and change the parameters accordingly.
 
 Source code
 -----------
@@ -120,14 +120,14 @@ versions used.
 Automatically deploying documentation to GitHub pages using Travis CI
 ---------------------------------------------------------------------
 
- * First do the steps described above to enable Travis CI integration
-   of your GitHub-hosted project.
-   
- * If you don't already have GitHub pages for your project: Create and
-   checkout a branch ``gh-pages`` in your repository and put an empty
-   file ``.nojekyll`` in it.  (See
-   https://help.github.com/articles/files-that-start-with-an-underscore-are-missing/)::
-   Commit it and push it to GitHub::
+* First do the steps described above to enable Travis CI integration
+  of your GitHub-hosted project.
+
+* If you don't already have GitHub pages for your project: Create and
+  checkout a branch ``gh-pages`` in your repository and put an empty
+  file ``.nojekyll`` in it.  (See
+  https://help.github.com/articles/files-that-start-with-an-underscore-are-missing/)::
+  Commit it and push it to GitHub::
 
     $ git clone --single-branch --depth 1 https://github.com/USER/PROJECT.git gh-pages
     $ cd gh-pages
@@ -138,38 +138,38 @@ Automatically deploying documentation to GitHub pages using Travis CI
     $ git commit -m "Initial commit"
     $ git push -u origin gh-pages
     $ cd ..
-    
- * (Back in your working copy:) Generate a new ssh key pair with an
-   empty passphrase::
+
+* (Back in your working copy:) Generate a new ssh key pair with an
+  empty passphrase::
 
     $ ssh-keygen -t dsa -f .travis_ci_gh_pages_deploy_key
 
- * Add the public ssh key (contents of the file
-   ``.travis_ci_gh_pages_deploy_key.pub``) to your GitHub repository
-   as a deploy key (Settings/Deploy keys/Add deploy key).
-   Title: Key for deploying documentation to GitHub pages.
-   Check Allow write access.
+* Add the public ssh key (contents of the file
+  ``.travis_ci_gh_pages_deploy_key.pub``) to your GitHub repository
+  as a deploy key (Settings/Deploy keys/Add deploy key).
+  Title: Key for deploying documentation to GitHub pages.
+  Check Allow write access.
 
- * Install the Travis CI command-line client from
-   https://github.com/travis-ci/travis.rb::
+* Install the Travis CI command-line client from
+  https://github.com/travis-ci/travis.rb::
 
     $ gem install travis
-   
- * Log in to Travis CI using your GitHub credentials::
+
+* Log in to Travis CI using your GitHub credentials::
 
     $ travis login
-   
- * Encrypt the private ssh key, add the decryption keys
-   as secure environment variables to Travis CI, and
-   add code to ``.travis.yml`` to decrypt it::
+
+* Encrypt the private ssh key, add the decryption keys
+  as secure environment variables to Travis CI, and
+  add code to ``.travis.yml`` to decrypt it::
 
     $ travis encrypt-file .travis_ci_gh_pages_deploy_key --add before_script
 
- * Add the encrypted private ssh key to the repository::
+* Add the encrypted private ssh key to the repository::
 
     $ git add .travis_ci_gh_pages_deploy_key.enc
 
- * Have git ignore the other keys (and the gh-pages directory)::
+* Have git ignore the other keys (and the gh-pages directory)::
 
     $ echo >> .gitignore
     $ echo "/.travis_ci_gh_pages_deploy_key" >> .gitignore
@@ -177,19 +177,19 @@ Automatically deploying documentation to GitHub pages using Travis CI
     $ echo "/gh-pages" >> .gitignore
     $ git add .gitignore
 
- * Optionally, edit ``.travis.yml`` to adjust variables ``DEPLOY_DOC_...``
+* Optionally, edit ``.travis.yml`` to adjust variables ``DEPLOY_DOC_...``
 
- * Commit all changes to GitHub.  The Travis CI build should then run
-   automatically and deploy it::
+* Commit all changes to GitHub.  The Travis CI build should then run
+  automatically and deploy it::
 
     $ git add .travis.yml
     $ git commit -m "Deploy built documentation to GitHub"
     $ git push
- 
- * The deployed documentation will be available at:
-   https://USER.github.io/PROJECT/
-   This can be customized by changing ``DEPLOY_DOC_TO_DIRECTORY=/``
-   to another directory in ``.travis.yml``
-   For example, setting ``DEPLOY_DOC_TO_DIRECTORY=doc/html`` will make
-   the deployed documentation available at:
-   https://USER.github.io/PROJECT/doc/html/
+
+* The deployed documentation will be available at:
+  https://USER.github.io/PROJECT/
+  This can be customized by changing ``DEPLOY_DOC_TO_DIRECTORY=/``
+  to another directory in ``.travis.yml``
+  For example, setting ``DEPLOY_DOC_TO_DIRECTORY=doc/html`` will make
+  the deployed documentation available at:
+  https://USER.github.io/PROJECT/doc/html/
diff --git a/sage_sample/ultimate_question.py b/sage_sample/ultimate_question.py
index 3e65e0e..16ff553 100644
--- a/sage_sample/ultimate_question.py
+++ b/sage_sample/ultimate_question.py
@@ -23,6 +23,7 @@
 - Viviane Pons: initial implementation
 """
 from sage.combinat.combinat import catalan_number
+from one_cython_file import quick_question
 
 def answer_to_ultimate_question():
     r"""
@@ -42,4 +43,4 @@ def answer_to_ultimate_question():
         sage: answer_to_ultimate_question() == 42
         True
     """
-    return catalan_number(5)
+    return quick_question(catalan_number(5)) - 1
diff --git a/setup.py b/setup.py
index 46bd63c..10a2f47 100644
--- a/setup.py
+++ b/setup.py
@@ -4,13 +4,26 @@
 from setuptools import setup
 from codecs import open # To open the README file with proper encoding
 from setuptools.command.test import test as TestCommand # for tests
+from distutils.command import build as build_module
 
+# The next block is needed if there are cython files
+from setuptools import Extension
+from Cython.Build import cythonize
+import Cython.Compiler.Options
+from sage.env import sage_include_directories
 
 # Get information from separate files (README, VERSION)
 def readfile(filename):
     with open(filename,  encoding='utf-8') as f:
         return f.read()
 
+# Check the right Sage version
+class build(build_module.build):
+    def run(self):
+        from sagemath.check_version import check_version
+        check_version(sage_required_version)
+        build_module.build.run(self)
+
 # For the tests
 class SageTest(TestCommand):
     def run_tests(self):
@@ -18,6 +31,16 @@ def run_tests(self):
         if errno != 0:
             sys.exit(1)
 
+# Cython modules
+ext_modules = [
+         Extension('sage_sample.one_cython_file',
+         sources = [os.path.join('sage_sample','one_cython_file.pyx')],
+         include_dirs=sage_include_directories())
+]
+
+# Specify the required Sage version
+sage_required_version = '>=7.6'
+
 setup(
     name = "sage_sample",
     version = readfile("VERSION"), # the VERSION file is shared with the documentation
@@ -40,6 +63,8 @@ def run_tests(self):
       'Programming Language :: Python :: 2.7',
     ], # classifiers list: https://pypi.python.org/pypi?%3Aaction=list_classifiers
     keywords = "SageMath packaging",
+    install_requires = ['sagemath'], # This ensures that Sage is installed
     packages = ['sage_sample'],
-    cmdclass = {'test': SageTest} # adding a special setup command for tests
+    ext_modules = cytonize(ext_modules), # This line is only needed if there are cython files present
+    cmdclass = {'build': build, 'test': SageTest} # adding a special setup command for tests
 )

From 7c4738441f18753fff2cbaf1743594990da6c383 Mon Sep 17 00:00:00 2001
From: Marc Masdeu <marc.masdeu@gmail.com>
Date: Wed, 19 Jul 2017 20:21:12 -0400
Subject: [PATCH 02/14] Finished implementing changes.

---
 .travis-deploy-doc.sh              |   3 +-
 .travis-install.sh                 |   9 ++-
 .travis-test.sh                    |   7 +-
 .travis.yml                        |  25 ++++---
 .travis_ci_gh_pages_deploy_key.enc | Bin 672 -> 672 bytes
 MANIFEST.in                        |   5 ++
 README.rst                         |  51 +++++++++-----
 sage_sample/one_cython_file.pyx    |   3 +
 setup.py                           | 103 +++++++++++++++++------------
 9 files changed, 125 insertions(+), 81 deletions(-)
 create mode 100644 MANIFEST.in
 create mode 100644 sage_sample/one_cython_file.pyx

diff --git a/.travis-deploy-doc.sh b/.travis-deploy-doc.sh
index 655557b..c16c8bb 100755
--- a/.travis-deploy-doc.sh
+++ b/.travis-deploy-doc.sh
@@ -10,7 +10,7 @@ if [[ "${TRAVIS_PULL_REQUEST}" == "false" && "${TRAVIS_BRANCH}" == "${DEPLOY_DOC
     fi
     chmod 600 .travis_ci_gh_pages_deploy_key
     eval `ssh-agent -s`
-    ssh-add .travis_ci_gh_pages_deploy_key
+    ssh-add .travis_ci_gh_pages_deploy_key < /dev/null
     rm -Rf gh-pages
     git clone --depth 1 git@github.com:${DEPLOY_DOC_TO_REPOSITORY}.git --depth 1 --branch=gh-pages gh-pages
     BUILT_DOCS_DIR=`cd docs/build/html && pwd`
@@ -25,3 +25,4 @@ if [[ "${TRAVIS_PULL_REQUEST}" == "false" && "${TRAVIS_BRANCH}" == "${DEPLOY_DOC
 	git push origin gh-pages
     fi
 fi
+/usr/bin/killall python2
diff --git a/.travis-install.sh b/.travis-install.sh
index eef217c..fbbd0a2 100755
--- a/.travis-install.sh
+++ b/.travis-install.sh
@@ -1,13 +1,16 @@
-#! /bin/sh
+#! /bin/bash
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
 # notice and this notice are preserved.  This file is offered as-is,
 # without any warranty.
 set -e
+SAGE_IMAGE=`python2 -c "import setup; print setup.get_all_version_names('${SAGE_SERVER}index.html',${SAGE_AGE})"`
+echo "Obtaining Sage image:"
+echo $SAGE_IMAGE
 cd $HOME
-if [ ! -x SageMath/sage ] ; then 
+if [ ! -x SageMath/sage ] ; then
     rm -f SageMath.tar.bz2
-    wget $SAGE_SERVER$SAGE_IMAGE -O SageMath.tar.bz2
+    wget ${SAGE_SERVER}${SAGE_IMAGE} -O SageMath.tar.bz2
     tar xf SageMath.tar.bz2
 fi
 MAKE="make -j4"
diff --git a/.travis-test.sh b/.travis-test.sh
index 453c716..d41adc5 100755
--- a/.travis-test.sh
+++ b/.travis-test.sh
@@ -1,10 +1,7 @@
 #! /bin/sh
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.  This file is offered as-is,
-# without any warranty.
 set -e
-$HOME/SageMath/sage -pip install --upgrade --no-index -v sagemath # Check that Sage is installed
+
+$HOME/SageMath/sage -pip install --upgrade -v -i https://pypi.python.org/pypi sagemath
 $HOME/SageMath/sage -pip install --upgrade --no-index -v .
 $HOME/SageMath/sage setup.py test
 (cd docs && $HOME/SageMath/sage -sh -c "make html")
diff --git a/.travis.yml b/.travis.yml
index 8c09eec..302ada3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,27 +1,26 @@
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.  This file is offered as-is,
-# without any warranty.
 language: python
 matrix:
   include:
-  - env: CACHE_NAME=7.6 DEPLOY_DOC_FROM_BRANCH=master DEPLOY_DOC_TO_REPOSITORY=username/sample_sage
-     DEPLOY_DOC_TO_DIRECTORY=doc/html SAGE_SERVER=http://mirrors.xmission.com/sage/ SAGE_IMAGE=linux/64bit/sage-7.6-Ubuntu_12.04-x86_64.tar.bz2
+  - env: CACHE_NAME=latest DEPLOY_DOC_FROM_BRANCH=master DEPLOY_DOC_TO_REPOSITORY=mmasdeu/sage_sample
+      DEPLOY_DOC_TO_DIRECTORY=doc/html SAGE_SERVER=http://mirrors.xmission.com/sage/linux/64bit/
+      SAGE_AGE=0
+  - env: CACHE_NAME=older SAGE_SERVER=http://mirrors.xmission.com/sage/linux/64bit/ SAGE_AGE=1
   allow_failures:
-  - env: CACHE_NAME=7.5.1 SAGE_SERVER=http://mirrors.xmission.com/sage/ SAGE_IMAGE=linux/64bit/sage-7.5.1-Ubuntu_12.04-x86_64.tar.bz2
+  - env: CACHE_NAME=older SAGE_SERVER=http://mirrors.xmission.com/sage/linux/64bit/ SAGE_AGE=1
+
 install:
-- ./.travis-install.sh
+- "./.travis-install.sh"
 script:
-- ./.travis-test.sh
+- "./.travis-test.sh"
 cache:
   directories:
-  - $HOME/SageMath
-  - $HOME/.cache/matplotlib
+  - "$HOME/SageMath"
+  - "$HOME/.cache/matplotlib"
   timeout: 1000
 before_cache:
 - rm -Rf $HOME/SageMath/logs $HOME/SageMath/.BUILDSTART
 after_success:
-- ./.travis-deploy-doc.sh
+- "./.travis-deploy-doc.sh"
 before_script:
-- openssl aes-256-cbc -K $encrypted_f96cc3b3888c_key -iv $encrypted_f96cc3b3888c_iv
+- openssl aes-256-cbc -K  $encrypted_2f33c728c8dc_key -iv $encrypted_2f33c728c8dc_iv
   -in .travis_ci_gh_pages_deploy_key.enc -out .travis_ci_gh_pages_deploy_key -d || true
diff --git a/.travis_ci_gh_pages_deploy_key.enc b/.travis_ci_gh_pages_deploy_key.enc
index 10c8b7416c67e178bfaff12f5b13ed6a935c4808..6d32e82d85c15bf4c294456a4bfc472e160e678e 100644
GIT binary patch
literal 672
zcmV;R0$=^VsQL1gY)$J^-0jd$&ir#jmt#e$5&rFyU~Rs*QDz!3l-CJYg2}3^VVHX(
zap#$b4cMG@r$Y<e=8tl)>g#q!;q1|Kv$J1@o`1lUG_&p1`a#W6$miTRd4dBA?>kIS
zyZU&{!o73h(1=ynh|MtOpUuSuJO+u)Dh4Wp(*8V_C8r6-$^a~Z2ci1?YvKZA!w@|&
zKD$j?F98#80L51+4XvnAvMcz023;Ew2Pa?|n!S<`n}b)QfB@ovXtg<~f@|K~p1LLV
zx71P5Loy~9Al0k1QYy_|B6Ar+cDB1uNUI9G`b&v|X99YH^f2g$pJq6a_a246xVEy@
z4LXBPy?9|`c~Uq-wqzty6Jz4{#oOAqB-epWD(r9gDxj2YTe1V>SD>Y<_jM@TR4}+o
zl5$575BSOOb>Od#k!^5yDzD%PLl9}cWAigQg-n((RZ&~ZC~^TKR_IC^(D{h~0wpbR
z5eC#*$V<htDpsn#ZU!JR8WI<2rC%}q=ewAJt~j7S^W9S#RSzwz^C1Gw^WG#6YS^!<
zUwE!Gbq;4dI}NqI9nTZ|?;H%2qW5{Pe}j~1ItKIAj8IR}9nCX(P#$(BsEP0w)Vi=k
zu9la*4*OP_VGxe7P_|CUXIEBkmc6D7=C5K1r-{uXj)EDU<5e?Yb$vZ^tU#psR1&Ro
z9UraB>xoOJrc59o!g_s?JU(UzPV+;y(A@~gH)XQ;!LJyip)D^9Qg{xQ7<@}Ezm$gk
zMUMlm){KRIm@GDK4lRHSDSuJ>!4{_#>;m%6rp2Xug~y$WDO(D3>6->Jwj-UTgSJJ+
z#d2|08o*YLTz9~=qDXZ3wDmWt57*aPja$raPim!0?d#vDetv9DK-&G2sdLJ3SC>-+
Gf*IqCc}R@_

literal 672
zcmV;R0$=^40#ogV%=OZZ!7M!7<pBF*EU)#3^RStn)D8?gne<THgV`E+Kpd{3V;gk1
z=HX)d?1)CSR&upC+|@4Fv5|)|W)(mK8%ezbyje@zc^C<OYj=1EsH=1nvb$ZVWUx>k
zke~XoX5czfH+UU?Ls8zc+LU*!&Q9K%B*Wc7)^JR#cGL~1h%7{tJK<{174~=PsUgiS
zi*@!;4*YWQ>$tf?JQq^Zqzo;pLGP3l{>NadlaCNdTwQFh@8KkEYJO}2#^v{A0sZ;I
zXyFKDw@$SY|H|~9=DnhpK#h}<*Z*>(YHz%Nc*c&-XTDv<N|eo1#URsxC~9sOngaWZ
z1HldHOfzDazLq_g(shhg_TB|4DO{$<&voY)4M>MzL1ZCbt`FA!q10mNcwCX7A3?HB
z?qIuwvU$h>>onSG9GeOy!q;$qi#`mWIi2vcv&3bxzOXWH>}22H?^sp&KL6&dk_v9@
zXrw()=T9N#&yAbo5eSIOn2M5TLB`s9SJiSZel0s$D&IIztJ*K|8ev9mJ1EvhJMQ({
zq+}?q0sBW_M;?{dGVWKsziS=+skcs9aN9c<F`;GMK&Qi(5zO$WgsO6z>aW4--6fY<
z*OTWSRTnL*=VVS$(fcT@lBLtz;)Y(xleEmK^>`PbiDzy-!%@Kma}PTWc9_qyL?L#)
zv<LjezqeD{iM>vzRn=6q?fjFSy`nmHeALx<fuyM^n(eUAA*z#(0L<%YKsivHlstgR
zKqvQ}o8t@_&a4&Ne*b_4+sSaG2MIcnc^pP~W)SzFot)F>WZmw5sNiLVpU;>|->Zo+
zt<3zJ?PQj{xplYm0mf6I?nix0;}JZO_zR{Zva#JjKZGs_m`bz@(i}~Yub2IJ*16^Q
GK=g8Ez+(ac

diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..8dc223c
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,5 @@
+prune sage_sample
+include VERSION
+include sage_sample/*.py
+include sage_sample/*.pyx
+
diff --git a/README.rst b/README.rst
index 253a0d1..561744c 100644
--- a/README.rst
+++ b/README.rst
@@ -2,12 +2,16 @@
 Sage Sample Package
 ===================
 
-This package is designed as as simple `SageMath <http://www.sagemath.org>`_ package
+This package is designed as a simple `SageMath <http://www.sagemath.org>`_ package
 example to serve as a good practice reference for package developers. We follow
 python recommendations and adapt them to the SageMath community. You can find more
 advanced documentation on python package creation on
 `How To Package Your Python Code <https://packaging.python.org/>`_.
 
+This is still a work in progress. Once this example will have
+stabilized, the plan is to make a
+`cookie cutter <https://cookiecutter.readthedocs.io/en/latest/>`_
+template out of it.
 
 Installation
 ------------
@@ -17,7 +21,7 @@ Local install from source
 
 Download the source from the git repository::
 
-    $ git clone https://github.com/nthiery/sage_sample.git
+    $ git clone https://github.com/sagemath/sage_sample.git
 
 Change to the root directory and run::
 
@@ -25,14 +29,26 @@ Change to the root directory and run::
 
 For convenience this package contains a [makefile](makefile) with this
 and other often used commands. Should you wish too, you can use the
-shorthand:
+shorthand::
 
     $ make install
 
 Install from PyPI
 ^^^^^^^^^^^^^^^^^^
 
-TODO: distribute on PyPI.
+Create an account at https://pypi.python.org/pypi
+
+Install ``twine`` in Sage::
+
+    $ sage -pip install --upgrade twine
+
+Create the distribution (you can also use ``bdist`` instead to create the built distribution instead of the source one)::
+
+    $ python setup.py sdist
+
+Upload to PyPI::
+
+    $ twine upload dist/* -r pypi
 
 Usage
 -----
@@ -73,7 +89,7 @@ configured in ``setup.py`` to run the tests::
 
 This is just calling ``sage -t`` with appropriate flags.
 
-Shorthand:
+Shorthand::
 
     $ make test
 
@@ -86,19 +102,19 @@ The documentation of the package can be generated using Sage's
     $ cd docs
     $ sage -sh -c "make html"
 
-Shorthand:
+Shorthand::
 
     $ make doc
 
 For this to work on your own package, make sure you follow the same
 structure as we do here:
 
- * Create a ``docs`` folder containing the exact same ``Makefile`` and a ``source``
-   folder.
- * Copy and paste the ``docs/source/conf.py`` file from this package and update
-   the few project specific variables at the beginning of the file.
- * Create an ``index.rst`` file as well as a ``<module name>.rst`` file for each
-   module you want on the documentation.
+* Create a ``docs`` folder containing the exact same ``Makefile`` and a ``source``
+  folder.
+* Copy and paste the ``docs/source/conf.py`` file from this package and update
+  the few project specific variables at the beginning of the file.
+* Create an ``index.rst`` file as well as a ``<module name>.rst`` file for each
+  module you want on the documentation.
 
 Travis CI integration
 ---------------------
@@ -111,11 +127,10 @@ Travis CI system are included.
 https://docs.travis-ci.com/user/for-beginners explains how to enable
 automatic Travis CI builds for your GitHub-hosted project.
 
-The scripts download and install binary releases (7.1-7.4) from a
+The scripts download and install the last two binary releases from a
 SageMath mirror.  Edit ``.travis-install.sh`` if some optional or
 experimental SageMath packages need to be installed prior to running
-your package.  Edit ``.travis.yml`` to change the list of SageMath
-versions used.
+your package.
 
 Automatically deploying documentation to GitHub pages using Travis CI
 ---------------------------------------------------------------------
@@ -125,9 +140,9 @@ Automatically deploying documentation to GitHub pages using Travis CI
 
 * If you don't already have GitHub pages for your project: Create and
   checkout a branch ``gh-pages`` in your repository and put an empty
-  file ``.nojekyll`` in it.  (See
-  https://help.github.com/articles/files-that-start-with-an-underscore-are-missing/)::
-  Commit it and push it to GitHub::
+  file ``.nojekyll`` in it (see
+  https://help.github.com/articles/files-that-start-with-an-underscore-are-missing/).
+  Then commit it and push it to GitHub::
 
     $ git clone --single-branch --depth 1 https://github.com/USER/PROJECT.git gh-pages
     $ cd gh-pages
diff --git a/sage_sample/one_cython_file.pyx b/sage_sample/one_cython_file.pyx
new file mode 100644
index 0000000..d872f7e
--- /dev/null
+++ b/sage_sample/one_cython_file.pyx
@@ -0,0 +1,3 @@
+# A sample cython file
+def quick_question(int a):
+    return a + 1
diff --git a/setup.py b/setup.py
index 10a2f47..9ebc533 100644
--- a/setup.py
+++ b/setup.py
@@ -1,16 +1,26 @@
 ## -*- encoding: utf-8 -*-
 import os
 import sys
+import re
+import urllib2
 from setuptools import setup
 from codecs import open # To open the README file with proper encoding
 from setuptools.command.test import test as TestCommand # for tests
 from distutils.command import build as build_module
 
-# The next block is needed if there are cython files
-from setuptools import Extension
-from Cython.Build import cythonize
-import Cython.Compiler.Options
-from sage.env import sage_include_directories
+# Obtain the different Sage versions
+def get_all_version_names(mirror_url, idx = None, distribution = 'Ubuntu_16.04-x86_64'):
+    if idx is None:
+        idx = 0
+    else:
+        idx = int(idx)
+    site = urllib2.urlopen(mirror_url).read()
+    ans = re.findall('(sage-([0-9]*(?:\.[0-9]*)*)-%s.tar.bz2)'%distribution, site)
+    all_version_names = []
+    for fname, ver in ans:
+        if fname not in all_version_names:
+            all_version_names.append(fname)
+    return all_version_names[idx]
 
 # Get information from separate files (README, VERSION)
 def readfile(filename):
@@ -24,47 +34,58 @@ def run(self):
         check_version(sage_required_version)
         build_module.build.run(self)
 
+
 # For the tests
 class SageTest(TestCommand):
     def run_tests(self):
-        errno = os.system("sage -t --force-lib sage_sample")
+        errno = os.system("sage -t --force-lib sage_sample sage_sample/*.pyx")
         if errno != 0:
             sys.exit(1)
 
-# Cython modules
-ext_modules = [
-         Extension('sage_sample.one_cython_file',
-         sources = [os.path.join('sage_sample','one_cython_file.pyx')],
-         include_dirs=sage_include_directories())
-]
+if __name__ == "__main__":
+
+    # The next block is needed if there are cython files
+    from setuptools import Extension
+    from Cython.Build import cythonize
+    import Cython.Compiler.Options
+    from sage.env import sage_include_directories
+
+
+    # Cython modules
+    ext_modules = [
+             Extension('sage_sample.one_cython_file',
+             sources = [os.path.join('sage_sample','one_cython_file.pyx')],
+             include_dirs=sage_include_directories())
+    ]
 
-# Specify the required Sage version
-sage_required_version = '>=7.6'
+    # Specify the required Sage version
+    sage_required_version = '>=7.5'
 
-setup(
-    name = "sage_sample",
-    version = readfile("VERSION"), # the VERSION file is shared with the documentation
-    description='An example of a basic sage package',
-    long_description = readfile("README.rst"), # get the long description from the README
-    url='https://github.com/sagemath/sage_sample',
-    author='Matthias Koeppe, Sébastien Labbé, Viviane Pons, Nicolas M. Thiéry, ... with inspiration from many',
-    author_email='viviane.pons@lri.fr', # choose a main contact email
-    license='GPLv2+', # This should be consistent with the LICENCE file
-    classifiers=[
-      # How mature is this project? Common values are
-      #   3 - Alpha
-      #   4 - Beta
-      #   5 - Production/Stable
-      'Development Status :: 4 - Beta',
-      'Intended Audience :: Science/Research',
-      'Topic :: Software Development :: Build Tools',
-      'Topic :: Scientific/Engineering :: Mathematics',
-      'License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)',
-      'Programming Language :: Python :: 2.7',
-    ], # classifiers list: https://pypi.python.org/pypi?%3Aaction=list_classifiers
-    keywords = "SageMath packaging",
-    install_requires = ['sagemath'], # This ensures that Sage is installed
-    packages = ['sage_sample'],
-    ext_modules = cytonize(ext_modules), # This line is only needed if there are cython files present
-    cmdclass = {'build': build, 'test': SageTest} # adding a special setup command for tests
-)
+    setup(
+        name = "sage_sample",
+        version = readfile("VERSION"), # the VERSION file is shared with the documentation
+        description='An example of a basic sage package',
+        long_description = readfile("README.rst"), # get the long description from the README
+        url='https://github.com/sagemath/sage_sample',
+        author='Matthias Koeppe, Sébastien Labbé, Viviane Pons, Nicolas M. Thiéry, ... with inspiration from many',
+        author_email='viviane.pons@lri.fr', # choose a main contact email
+        license='GPLv2+', # This should be consistent with the LICENCE file
+        classifiers=[
+          # How mature is this project? Common values are
+          #   3 - Alpha
+          #   4 - Beta
+          #   5 - Production/Stable
+          'Development Status :: 4 - Beta',
+          'Intended Audience :: Science/Research',
+          'Topic :: Software Development :: Build Tools',
+          'Topic :: Scientific/Engineering :: Mathematics',
+          'License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)',
+          'Programming Language :: Python :: 2.7',
+        ], # classifiers list: https://pypi.python.org/pypi?%3Aaction=list_classifiers
+        keywords = "SageMath packaging",
+        install_requires = ['sagemath'], # This ensures that Sage is installed
+        packages = ['sage_sample'],
+        ext_modules = cythonize(ext_modules), # This line is only needed if there are cython files present
+        include_package_data = True,
+        cmdclass = {'build': build, 'test': SageTest} # adding a special setup command for tests
+    )

From 99353908441db0fc8a1de65c3fa545390b267dfc Mon Sep 17 00:00:00 2001
From: Marc Masdeu <marc.masdeu@gmail.com>
Date: Wed, 2 Aug 2017 12:28:14 +0200
Subject: [PATCH 03/14] Added requirements file and modified setup.py
 accordingly.

---
 requirements.txt | 2 ++
 setup.py         | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 requirements.txt

diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..fd6a52a
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,2 @@
+sagemath >= 7.5
+cython >= 0.26
diff --git a/setup.py b/setup.py
index 9ebc533..e27248f 100644
--- a/setup.py
+++ b/setup.py
@@ -60,6 +60,7 @@ def run_tests(self):
 
     # Specify the required Sage version
     sage_required_version = '>=7.5'
+    REQUIREMENTS = [i.strip() for i in open("requirements.txt").readlines()]
 
     setup(
         name = "sage_sample",
@@ -83,7 +84,7 @@ def run_tests(self):
           'Programming Language :: Python :: 2.7',
         ], # classifiers list: https://pypi.python.org/pypi?%3Aaction=list_classifiers
         keywords = "SageMath packaging",
-        install_requires = ['sagemath'], # This ensures that Sage is installed
+        install_requires = REQUIREMENTS, # This ensures that Sage is installed
         packages = ['sage_sample'],
         ext_modules = cythonize(ext_modules), # This line is only needed if there are cython files present
         include_package_data = True,

From 3efa00d4db8dd4ed2084b831f3344a3bfd49935a Mon Sep 17 00:00:00 2001
From: Marc Masdeu <marc.masdeu@gmail.com>
Date: Wed, 2 Aug 2017 12:28:14 +0200
Subject: [PATCH 04/14] Changed version of dummy sagemath package to 1.2.8

---
 requirements.txt | 2 ++
 setup.py         | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 requirements.txt

diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..06b413f
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,2 @@
+sagemath >= 1.0
+cython >= 0.26
diff --git a/setup.py b/setup.py
index 9ebc533..e27248f 100644
--- a/setup.py
+++ b/setup.py
@@ -60,6 +60,7 @@ def run_tests(self):
 
     # Specify the required Sage version
     sage_required_version = '>=7.5'
+    REQUIREMENTS = [i.strip() for i in open("requirements.txt").readlines()]
 
     setup(
         name = "sage_sample",
@@ -83,7 +84,7 @@ def run_tests(self):
           'Programming Language :: Python :: 2.7',
         ], # classifiers list: https://pypi.python.org/pypi?%3Aaction=list_classifiers
         keywords = "SageMath packaging",
-        install_requires = ['sagemath'], # This ensures that Sage is installed
+        install_requires = REQUIREMENTS, # This ensures that Sage is installed
         packages = ['sage_sample'],
         ext_modules = cythonize(ext_modules), # This line is only needed if there are cython files present
         include_package_data = True,

From a43ad77f8eeb56189ac85ed8f4558cde46bfd770 Mon Sep 17 00:00:00 2001
From: Marc Masdeu <marc.masdeu@gmail.com>
Date: Wed, 2 Aug 2017 20:31:03 +0200
Subject: [PATCH 05/14] Now really to 1.2.8.

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 06b413f..c2552f5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
-sagemath >= 1.0
+sagemath >= 1.2.8
 cython >= 0.26

From 4b46f0f3a3a1fe1ad93303388d4b36269e760c34 Mon Sep 17 00:00:00 2001
From: Marc Masdeu <marc.masdeu@gmail.com>
Date: Thu, 3 Aug 2017 15:45:08 +0200
Subject: [PATCH 06/14] Downgraded required Sage version to 7.4

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index e27248f..be70e77 100644
--- a/setup.py
+++ b/setup.py
@@ -59,7 +59,7 @@ def run_tests(self):
     ]
 
     # Specify the required Sage version
-    sage_required_version = '>=7.5'
+    sage_required_version = '>=7.4'
     REQUIREMENTS = [i.strip() for i in open("requirements.txt").readlines()]
 
     setup(

From fa3acb648462b6c6af6388686bcf147771d78d9c Mon Sep 17 00:00:00 2001
From: Marc <marc.masdeu@gmail.com>
Date: Mon, 29 Apr 2019 15:45:10 +0200
Subject: [PATCH 07/14] Added line to force use of Python 2.7

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 302ada3..11d1f22 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 language: python
+python: 2.7
 matrix:
   include:
   - env: CACHE_NAME=latest DEPLOY_DOC_FROM_BRANCH=master DEPLOY_DOC_TO_REPOSITORY=mmasdeu/sage_sample

From ea1de0f7936d960177af1288367e78fe1a3cd186 Mon Sep 17 00:00:00 2001
From: Marc <marc.masdeu@gmail.com>
Date: Mon, 20 May 2019 15:14:14 +0200
Subject: [PATCH 08/14] Update .travis-install.sh

---
 .travis-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis-install.sh b/.travis-install.sh
index fbbd0a2..b10dde9 100755
--- a/.travis-install.sh
+++ b/.travis-install.sh
@@ -4,7 +4,7 @@
 # notice and this notice are preserved.  This file is offered as-is,
 # without any warranty.
 set -e
-SAGE_IMAGE=`python2 -c "import setup; print setup.get_all_version_names('${SAGE_SERVER}index.html',${SAGE_AGE})"`
+SAGE_IMAGE=`python2 -c "import setup; print setup.get_all_version_names('${SAGE_SERVER}index.html',${SAGE_AGE}, distribution=${UBUNTU_VERSION})"`
 echo "Obtaining Sage image:"
 echo $SAGE_IMAGE
 cd $HOME

From e961267dfec7ca46cf66b7c6276e4e882623afcb Mon Sep 17 00:00:00 2001
From: Marc <marc.masdeu@gmail.com>
Date: Mon, 20 May 2019 15:15:24 +0200
Subject: [PATCH 09/14] Update .travis.yml

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 11d1f22..be1e99f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,10 +4,12 @@ matrix:
   include:
   - env: CACHE_NAME=latest DEPLOY_DOC_FROM_BRANCH=master DEPLOY_DOC_TO_REPOSITORY=mmasdeu/sage_sample
       DEPLOY_DOC_TO_DIRECTORY=doc/html SAGE_SERVER=http://mirrors.xmission.com/sage/linux/64bit/
-      SAGE_AGE=0
+      SAGE_AGE=0 UBUNTU_VERSION=Ubuntu_18.04-x86_64
   - env: CACHE_NAME=older SAGE_SERVER=http://mirrors.xmission.com/sage/linux/64bit/ SAGE_AGE=1
+      UBUNTU_VERSION=Ubuntu_18.04-x86_64
   allow_failures:
   - env: CACHE_NAME=older SAGE_SERVER=http://mirrors.xmission.com/sage/linux/64bit/ SAGE_AGE=1
+      UBUNTU_VERSION=Ubuntu_18.04-x86_64
 
 install:
 - "./.travis-install.sh"

From a5d99d88d6493a7f42d3457d239696ea612cf590 Mon Sep 17 00:00:00 2001
From: Marc <marc.masdeu@gmail.com>
Date: Mon, 20 May 2019 15:19:17 +0200
Subject: [PATCH 10/14] Update .travis-install.sh

---
 .travis-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis-install.sh b/.travis-install.sh
index b10dde9..f5bc8ca 100755
--- a/.travis-install.sh
+++ b/.travis-install.sh
@@ -4,7 +4,7 @@
 # notice and this notice are preserved.  This file is offered as-is,
 # without any warranty.
 set -e
-SAGE_IMAGE=`python2 -c "import setup; print setup.get_all_version_names('${SAGE_SERVER}index.html',${SAGE_AGE}, distribution=${UBUNTU_VERSION})"`
+SAGE_IMAGE=`python2 -c "import setup; print setup.get_all_version_names('${SAGE_SERVER}index.html',${SAGE_AGE}, distribution='${UBUNTU_VERSION}')"`
 echo "Obtaining Sage image:"
 echo $SAGE_IMAGE
 cd $HOME

From ffa34c383eac0ccc30550c3e8c4dbc1ca1270098 Mon Sep 17 00:00:00 2001
From: Marc <marc.masdeu@gmail.com>
Date: Tue, 21 May 2019 09:13:13 +0200
Subject: [PATCH 11/14] Update .travis.yml

---
 .travis.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index be1e99f..b8b1f81 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,16 @@
 language: python
 python: 2.7
+dist: xenial
 matrix:
   include:
   - env: CACHE_NAME=latest DEPLOY_DOC_FROM_BRANCH=master DEPLOY_DOC_TO_REPOSITORY=mmasdeu/sage_sample
       DEPLOY_DOC_TO_DIRECTORY=doc/html SAGE_SERVER=http://mirrors.xmission.com/sage/linux/64bit/
-      SAGE_AGE=0 UBUNTU_VERSION=Ubuntu_18.04-x86_64
+      SAGE_AGE=0 UBUNTU_VERSION=Ubuntu_16.04-x86_64
   - env: CACHE_NAME=older SAGE_SERVER=http://mirrors.xmission.com/sage/linux/64bit/ SAGE_AGE=1
-      UBUNTU_VERSION=Ubuntu_18.04-x86_64
+      UBUNTU_VERSION=Ubuntu_16.04-x86_64
   allow_failures:
   - env: CACHE_NAME=older SAGE_SERVER=http://mirrors.xmission.com/sage/linux/64bit/ SAGE_AGE=1
-      UBUNTU_VERSION=Ubuntu_18.04-x86_64
+      UBUNTU_VERSION=Ubuntu_16.04-x86_64
 
 install:
 - "./.travis-install.sh"

From 3a27d0c51fe3cdd14a9477179577f1b4ed31e3cf Mon Sep 17 00:00:00 2001
From: Marc <marc.masdeu@gmail.com>
Date: Tue, 21 May 2019 09:38:24 +0200
Subject: [PATCH 12/14] Update .travis-test.sh

---
 .travis-test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis-test.sh b/.travis-test.sh
index d41adc5..bbb0b60 100755
--- a/.travis-test.sh
+++ b/.travis-test.sh
@@ -5,4 +5,4 @@ $HOME/SageMath/sage -pip install --upgrade -v -i https://pypi.python.org/pypi sa
 $HOME/SageMath/sage -pip install --upgrade --no-index -v .
 $HOME/SageMath/sage setup.py test
 (cd docs && $HOME/SageMath/sage -sh -c "make html")
-$HOME/SageMath/sage -pip uninstall .
+$HOME/SageMath/sage -pip uninstall sage_sample

From 9d7a248eceb6e3cc6635d68cf55ca95eaf039f5e Mon Sep 17 00:00:00 2001
From: Marc <marc.masdeu@gmail.com>
Date: Wed, 19 Feb 2020 14:19:05 +0100
Subject: [PATCH 13/14] Update setup.py

---
 setup.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index be70e77..2db5ab8 100644
--- a/setup.py
+++ b/setup.py
@@ -49,6 +49,7 @@ def run_tests(self):
     from Cython.Build import cythonize
     import Cython.Compiler.Options
     from sage.env import sage_include_directories
+    from sage.misc.banner import version as sage_version
 
 
     # Cython modules
@@ -59,7 +60,9 @@ def run_tests(self):
     ]
 
     # Specify the required Sage version
-    sage_required_version = '>=7.4'
+    sage_required_version = u'>=8.9'
+    sage_current_version = sage_version()
+    py2 = bool('8.' in sage_current_version or '7.' in sage_current_version)
     REQUIREMENTS = [i.strip() for i in open("requirements.txt").readlines()]
 
     setup(
@@ -68,7 +71,7 @@ def run_tests(self):
         description='An example of a basic sage package',
         long_description = readfile("README.rst"), # get the long description from the README
         url='https://github.com/sagemath/sage_sample',
-        author='Matthias Koeppe, Sébastien Labbé, Viviane Pons, Nicolas M. Thiéry, ... with inspiration from many',
+        author='Matthias Koeppe, Sébastien Labbé, Marc Masdeu, Viviane Pons, Nicolas M. Thiéry, ... with inspiration from many',
         author_email='viviane.pons@lri.fr', # choose a main contact email
         license='GPLv2+', # This should be consistent with the LICENCE file
         classifiers=[
@@ -81,12 +84,14 @@ def run_tests(self):
           'Topic :: Software Development :: Build Tools',
           'Topic :: Scientific/Engineering :: Mathematics',
           'License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)',
-          'Programming Language :: Python :: 2.7',
+          'Programming Language :: Python :: 3.8',
         ], # classifiers list: https://pypi.python.org/pypi?%3Aaction=list_classifiers
         keywords = "SageMath packaging",
         install_requires = REQUIREMENTS, # This ensures that Sage is installed
         packages = ['sage_sample'],
-        ext_modules = cythonize(ext_modules), # This line is only needed if there are cython files present
+        # The following line is only needed if there are cython files present
+        ext_modules = cythonize(ext_modules) if py2 \
+            else cythonize(ext_modules, compiler_directives={'language_level' : "3"}),
         include_package_data = True,
         cmdclass = {'build': build, 'test': SageTest} # adding a special setup command for tests
     )

From 300e4c1322f5254a5b45d89486d2d6ba6fc29e02 Mon Sep 17 00:00:00 2001
From: Marc <marc.masdeu@gmail.com>
Date: Wed, 19 Feb 2020 14:19:24 +0100
Subject: [PATCH 14/14] Update .travis-test.sh

---
 .travis-test.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis-test.sh b/.travis-test.sh
index bbb0b60..434f519 100755
--- a/.travis-test.sh
+++ b/.travis-test.sh
@@ -1,6 +1,7 @@
 #! /bin/sh
 set -e
 
+mkdir -p $HOME/SageMath/build/pkgs
 $HOME/SageMath/sage -pip install --upgrade -v -i https://pypi.python.org/pypi sagemath
 $HOME/SageMath/sage -pip install --upgrade --no-index -v .
 $HOME/SageMath/sage setup.py test