kallithea Changeset - d9e37f7fd35b

Changeset - d9e37f7fd35b

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Mads Kiilerich - 6 years ago 2019-08-12 12:54:01
mads@kiilerich.com

Grafted from: 450e086c18bf

docs: always use dev_requirements.txt together with main version constraints in setup.py

pip isn't good at considering old constraints when installing or updating
packages later. Instead, install everything at once.

Note: pip and setuptools are usually installed automatically and could perhaps
be removed from documentation. But for now, let's keep it.

4 files changed with 4 insertions and 9 deletions:

Jenkinsfile

docs/contributing.rst

scripts/make-release

scripts/validate-commits

0 comments (0 inline, 0 general)

Jenkinsfile

➞

Show inline comments

@@ @@ -35,26 +35,25 @@ node { @@
         if (isUnix()) {
             virtualenvscript += """
                 pip install --upgrade python-ldap
                 pip install --upgrade python-pam
                 """
             sh virtualenvscript
         } else {
             bat virtualenvscript
+        }
+    }
     stage('setup') {
         def virtualenvscript = """$activatevirtualenv
             pip install --upgrade -e .
             pip install -r dev_requirements.txt
             pip install --upgrade -e . -r dev_requirements.txt
             python setup.py compile_catalog
             """
         if (isUnix()) {
             sh virtualenvscript
         } else {
             bat virtualenvscript
+        }
         stash name: 'kallithea', useDefaultExcludes: false
+    }
     stage('pylint') {
         sh script: """$activatevirtualenv
             pylint -j 0 --disable=C -f parseable kallithea > pylint.out

docs/contributing.rst

➞

Show inline comments

@@ @@ -26,26 +26,25 @@ for more details. @@
 Getting started
 ---------------
 To get started with Kallithea development::
         hg clone https://kallithea-scm.org/repos/kallithea
         cd kallithea
         virtualenv ../kallithea-venv
         source ../kallithea-venv/bin/activate
         pip install --upgrade pip setuptools
         pip install --upgrade -e .
         pip install --upgrade -r dev_requirements.txt
         pip install --upgrade -e . -r dev_requirements.txt
         kallithea-cli config-create my.ini
         kallithea-cli db-create -c my.ini --user=user --email=user@example.com --password=password --repos=/tmp
         kallithea-cli front-end-build
         gearbox serve -c my.ini --reload &
         firefox http://127.0.0.1:5000/
 If you plan to use Bitbucket_ for sending contributions, you can also fork
 Kallithea on Bitbucket_ first (https://bitbucket.org/conservancy/kallithea) and
 then replace the clone step above by a clone of your fork. In this case, please
 see :ref:`contributing-guidelines` below for configuring your fork correctly.

scripts/make-release

➞

Show inline comments

@@ @@ -10,26 +10,25 @@ cleanup() @@
 echo "Checking that you are NOT inside a virtualenv"
 [ -z "$VIRTUAL_ENV" ]
 venv=$(mktemp -d --tmpdir kallithea-release-XXXXX)
 trap cleanup EXIT
 echo "Setting up a fresh virtualenv in $venv"
 virtualenv -p python2 "$venv"
 . "$venv/bin/activate"
 echo "Install/verify tools needed for building and uploading stuff"
 pip install --upgrade -e .
 pip install --upgrade -r dev_requirements.txt twine
 pip install --upgrade -e . -r dev_requirements.txt twine
 echo "Cleanup and update copyrights ... and clean checkout"
 scripts/run-all-cleanup
 scripts/update-copyrights.py
 hg up -cr .
 echo "Make release build from clean checkout in build/"
 rm -rf build dist
 hg archive build
 cd build
 echo "Check that each entry in MANIFEST.in match something"

scripts/validate-commits

➞

Show inline comments

@@ @@ -28,27 +28,25 @@ finish() @@
     rm "$resultfile"
+}
 trap finish EXIT
 for rev in $(hg log -r "$1" -T '{node}\n'); do
     hg log -r "$rev"
     hg update "$rev"
     cleanup
     virtualenv -p "$(command -v python2)" "$venv"
     source "$venv/bin/activate"
     pip install --upgrade pip setuptools
     pip install -e .
     pip install -r dev_requirements.txt
     pip install python-ldap python-pam
     pip install -e . -r dev_requirements.txt python-ldap python-pam
     # run-all-cleanup
     scripts/run-all-cleanup
     if ! hg update --check -q .; then
         echo "run-all-cleanup did not give clean results!"
         result="NOK"
         hg diff
         hg revert -a
     else
         result=" OK"
     fi
     echo "$result: $rev (run-all-cleanup)" >> "$resultfile"

0 comments (0 inline, 0 general)