[Git][debian-gis-team/cftime][upstream] New upstream version 1.1.1.2+ds

[Bas Couwenberg]

Bas Couwenberg pushed to branch upstream at Debian GIS Project / cftime


Commits:
7e21a93f by Bas Couwenberg at 2020-03-24T05:43:38+01:00
New upstream version 1.1.1.2+ds
- - - - -


8 changed files:

- .gitignore
- .travis.yml
- Changelog
- MANIFEST.in
- README.release
- cftime/_cftime.pyx
- requirements-dev.txt
- setup.cfg


Changes:

=====================================
.gitignore
=====================================
@@ -6,3 +6,4 @@ build/
 *.egg-info
 __pycache__
 .pytest_cache/
+dist/


=====================================
.travis.yml
=====================================
@@ -6,14 +6,19 @@ sudo: false # use container based build
 notifications:
   email: false
 
-env:
-  - PYTHON_VERSION=2.7
-  - PYTHON_VERSION=3.7
-  - PYTHON_VERSION=3.8
-
 matrix:
+  fast_finish: true
   include:
-    - env: PYTHON_VERSION=3.7 BUILD_DOCS="true"
+    - name: "python-2.7"
+      env: PY=2.7
+    - name: "python-3.7"
+      env: PY=3.7
+    - name: "python-3.8"
+      env: PY=3.8
+    - name: "tarball"
+      env: PY=3
+    - name: "docs"
+      env: PY=3
 
 before_install:
   # Build the conda testing environment.
@@ -25,11 +30,8 @@ before_install:
     conda update conda --yes --all;
     conda config --add channels conda-forge --force;
     export ENV_NAME="test-environment";
-    conda create --yes -n ${ENV_NAME} python=${PYTHON_VERSION} --file requirements.txt --file requirements-dev.txt;
+    conda create --yes -n ${ENV_NAME} python=${PY} --file requirements.txt --file requirements-dev.txt;
     source activate ${ENV_NAME};
-    if [[ "${BUILD_DOCS}" == "true" ]]; then
-      conda install -qy sphinx;
-    fi;
 
   # Log the conda environment and package details.
   - conda list -n ${ENV_NAME}
@@ -39,13 +41,23 @@ before_install:
 install:
   # Install cftime.
   - echo "Installing cftime..."
-  - CYTHON_COVERAGE=1 pip install -e .
+  - CYTHON_COVERAGE=1 pip install -e . --no-deps --force-reinstall
 
 script:
-  - if [[ "${BUILD_DOCS}" == "true" ]]; then
+  - if [[ $TRAVIS_JOB_NAME == python-* ]]; then
+      cp -r test/ /tmp ;
+      pushd /tmp && pytest && popd ;
+    fi
+
+  - if [[ $TRAVIS_JOB_NAME == 'docs' ]]; then
       pushd docs && make html linkcheck O=-W && popd;
-    else
-      pytest;
+    fi
+
+  - if [[ $TRAVIS_JOB_NAME == 'tarball' ]]; then
+     python setup.py --version ;
+     pip wheel . -w dist --no-deps ;
+     check-manifest --verbose ;
+     twine check dist/* ;
     fi
 
 after_success:
@@ -53,10 +65,11 @@ after_success:
 
 before_deploy:
   # Remove unused, unminified javascript from sphinx
-  - if [[ "${BUILD_DOCS}" == "true" ]]; then
-      rm -f docs/build/html/_static/jquery-*.js;
-      rm -f docs/build/html/_static/underscore-*.js;
-      rm -f docs/build/html/.buildinfo;
+  - |
+    if [[ $TRAVIS_JOB_NAME == 'docs' ]]; then
+      rm -f docs/build/html/_static/jquery-*.js
+      rm -f docs/build/html/_static/underscore-*.js
+      rm -f docs/build/html/.buildinfo
     fi
 
 deploy:
@@ -65,4 +78,4 @@ deploy:
     skip_cleanup: true
     on:
       branch: master
-      condition: '${PYTHON_VERSION} == 3.7 && ${BUILD_DOCS} == "true"'
+      condition: '$TRAVIS_JOB_NAME == "tarball"'


=====================================
Changelog
=====================================
@@ -1,3 +1,8 @@
+version 1.1.1.2 (release tag v1.1.1.2rel)
+=========================================
+ * include pyproject.toml in MANIFEST.in so it gets 
+   included in source tarball (issue #154).
+
 version 1.1.1.1 (release tag v1.1.1.1rel)
 =========================================
  * Fix error installing with pip on python 3.8 by following 


=====================================
MANIFEST.in
=====================================
@@ -1,6 +1,8 @@
 include *.txt
 include README.md
 include COPYING
+include pyproject.toml
+include Changelog
 recursive-include cftime *.py
 recursive-include cftime *.pyx
 recursive-exclude cftime *.c


=====================================
README.release
=====================================
@@ -11,6 +11,7 @@
   in https://github.com/MacPython/cftime-wheels.
   Push those changes to trigger the binary wheel builds (for
   macos x, linux and windows). 
+* run check-manifest --verbose to check that source tarball will be OK.
 * Download the binary wheels from wheels.scipy.org, put them in a
   directory called 'upload'.  Create a source tarball using 
    % python setup.py clean


=====================================
cftime/_cftime.pyx
=====================================
@@ -52,7 +52,7 @@ cdef int32_t* days_per_month_array = [
 _rop_lookup = {Py_LT: '__gt__', Py_LE: '__ge__', Py_EQ: '__eq__',
                Py_GT: '__lt__', Py_GE: '__le__', Py_NE: '__ne__'}
 
-__version__ = '1.1.1.1'
+__version__ = '1.1.1.2'
 
 # Adapted from http://delete.me.uk/2005/03/iso8601.html
 # Note: This regex ensures that all ISO8601 timezone formats are accepted - but, due to legacy support for other timestrings, not all incorrect formats can be rejected.


=====================================
requirements-dev.txt
=====================================
@@ -1,5 +1,9 @@
+check-manifest
 coverage
 coveralls
 cython
 pytest
 pytest-cov
+sphinx
+twine
+wheel


=====================================
setup.cfg
=====================================
@@ -8,3 +8,16 @@ addopts =
     --cov=cftime
     --cov-report term-missing
 doctest_optionflags = NORMALIZE_WHITESPACE ELLIPSIS
+
+[check-manifest]
+ignore =
+    *.yml
+    .coveragerc
+    .gitignore
+    README.release
+    ci
+    ci/*
+    docs
+    docs/*
+    test
+    test/*
\ No newline at end of file



View it on GitLab: https://salsa.debian.org/debian-gis-team/cftime/-/commit/7e21a93f27b17c9164ae22c3c550e7f410cae87e

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/cftime/-/commit/7e21a93f27b17c9164ae22c3c550e7f410cae87e
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20200324/88e8b67f/attachment-0001.html>