Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to setuptools-scm instead of versioneer. #1545

Merged
merged 1 commit into from
Jul 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ install:
- conda config --add channels conda-forge/label/testing
- if %PYTHON_VERSION%==3.6 conda update conda --yes
- set ENV_NAME=test-environment
- set PACKAGES=%PACKAGES% pillow pytest filelock pep8 pyshp shapely six requests pyepsg owslib
- set PACKAGES=%PACKAGES% filelock owslib pep8 pillow pyepsg pyshp pytest
- set PACKAGES=%PACKAGES% requests setuptools_scm setuptools_scm_git_archive
- set PACKAGES=%PACKAGES% shapely
- conda create -n %ENV_NAME% python=%PYTHON_VERSION% %PACKAGES%
- activate %ENV_NAME%
- set INCLUDE=%CONDA_PREFIX%\Library\include;%INCLUDE%
Expand Down
17 changes: 9 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,20 @@ deps-run: &deps-install
name: Install Python dependencies
command: |
conda install -n test-environment --quiet \
numpy \
matplotlib \
scipy \
cython \
matplotlib \
numpy \
owslib \
pillow \
proj4 \
pyshp \
shapely \
six \
requests \
pyepsg \
owslib \
pykdtree \
pyshp \
requests \
scipy \
setuptools_scm \
setuptools_scm_git_archive \
shapely \
$EXTRA_PACKAGES \
--file docs/doc-requirements.txt
conda list -n test-environment
Expand Down
1 change: 1 addition & 0 deletions .git_archival.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ref-names: $Format:%D$
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1 @@
lib/cartopy/_version.py export-subst
.git_archival.txt export-subst
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ dist
.pytest_cache/

# cartopy build files
lib/cartopy/_version.py
lib/cartopy/trace.cpp
lib/cartopy/trace.so
lib/cartopy/trace.*.so
Expand Down
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ install:

# Customise the testing environment
# ---------------------------------
- PACKAGES="$PACKAGES pillow pytest pytest-xdist filelock pep8 pyshp shapely six requests pyepsg owslib"
- PACKAGES="$PACKAGES filelock owslib pep8 pillow pyepsg pyshp pytest"
- PACKAGES="$PACKAGES pytest-xdist requests setuptools_scm"
- PACKAGES="$PACKAGES setuptools_scm_git_archive shapely"
- |
if [[ "$NAME" == "Latest everything"* ]]; then
PACKAGES="$PACKAGES pytest-cov coveralls";
Expand All @@ -60,7 +62,7 @@ install:
# Install cartopy
# ---------------
- pip install --no-deps .
- python -c "import cartopy; print('Version ', cartopy.__version__)" && python setup.py version
- python -c "import cartopy; print('Version ', cartopy.__version__)"

script:
# Check that the downloader tool at least knows where to get the data from (but don't actually download it)
Expand Down
1 change: 0 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@ include lib/cartopy/io/srtm.npz
include lib/cartopy/tests/lakes_shapefile/*
recursive-include lib *.py
recursive-include lib *.pyx *.pxd *.h *.c *.cpp
include versioneer.py
4 changes: 1 addition & 3 deletions lib/cartopy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.

from ._version import get_versions
__version__ = get_versions()['version']
del get_versions
from ._version import version as __version__ # noqa: F401

__document_these__ = ['config']

Expand Down
Loading