From 41cc0f71bee04f88ad4a8f83546f6433d06efcb8 Mon Sep 17 00:00:00 2001 From: JessicaS11 Date: Thu, 4 Feb 2021 20:13:16 +0000 Subject: [PATCH 1/6] fix pre-commit library typo --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 016bf3b5f..0709b89f3 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,5 @@ codecov -pre_commit +pre-commit pypistats[pandas] pytest>=4.6 pytest-cov From e5de47c9a99049f3d9142d6d010c628f41c8c2fe Mon Sep 17 00:00:00 2001 From: JessicaS11 Date: Thu, 4 Feb 2021 20:14:32 +0000 Subject: [PATCH 2/6] add local_scheme keyword to use_scm_version --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 2b73b205e..b110b38a0 100644 --- a/setup.py +++ b/setup.py @@ -27,8 +27,9 @@ "Development Status :: 1 - Planning", ], use_scm_version={ + "local_scheme": "no-local-version", "write_to": "_version.py", "write_to_template": 'version = "{version}"\n', }, - setup_requires=["setuptools>=30.3.0", "wheel", "setuptools_scm"] + setup_requires=["setuptools>=30.3.0", "wheel", "setuptools_scm"], ) From 28301290dc123bd1e52600b2ec2365a9c379ce50 Mon Sep 17 00:00:00 2001 From: Landung Setiawan Date: Tue, 16 Feb 2021 10:46:02 -0800 Subject: [PATCH 3/6] Update versioning and packaging --- MANIFEST.in | 12 +++++++++++- icepyx/__init__.py | 2 +- setup.py | 3 ++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 096dd5031..abe9ddac8 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1,12 @@ -include LICENSE +prune .github* +prune doc* +prune examples* +prune icepyx/tests* +exclude *.yml +exclude *.yaml +exclude *.ini +exclude .coveragerc +exclude .mailmap +exclude .gitignore +exclude *.txt include requirements.txt diff --git a/icepyx/__init__.py b/icepyx/__init__.py index e70e9b1dc..653764c6e 100644 --- a/icepyx/__init__.py +++ b/icepyx/__init__.py @@ -1,3 +1,3 @@ from icepyx.core.query import Query -from _version import version as __version__ +from _icepyx_version import version as __version__ diff --git a/setup.py b/setup.py index b110b38a0..34799ac09 100644 --- a/setup.py +++ b/setup.py @@ -26,9 +26,10 @@ "Operating System :: OS Independent", "Development Status :: 1 - Planning", ], + py_modules=["_icepyx_version"], use_scm_version={ "local_scheme": "no-local-version", - "write_to": "_version.py", + "write_to": "_icepyx_version.py", "write_to_template": 'version = "{version}"\n', }, setup_requires=["setuptools>=30.3.0", "wheel", "setuptools_scm"], From 459564d73861a4ecb2913e3a49b8e185c492660f Mon Sep 17 00:00:00 2001 From: "Landung \"Don\" Setiawan" Date: Wed, 17 Feb 2021 08:56:25 -0800 Subject: [PATCH 4/6] Update MANIFEST.in to be alphabetical Co-authored-by: Wei Ji <23487320+weiji14@users.noreply.github.com> --- MANIFEST.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index abe9ddac8..957ccc9e2 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -2,11 +2,11 @@ prune .github* prune doc* prune examples* prune icepyx/tests* -exclude *.yml -exclude *.yaml -exclude *.ini exclude .coveragerc -exclude .mailmap exclude .gitignore +exclude .mailmap +exclude *.ini exclude *.txt +exclude *.yaml +exclude *.yml include requirements.txt From d5ac78d54ec8ed10ceb1daa2de1cf45dcf9fa4df Mon Sep 17 00:00:00 2001 From: Jessica Scheick Date: Fri, 5 Mar 2021 14:12:47 -0500 Subject: [PATCH 5/6] remove -r from requirements-docs and add requirements to readthedocs.yml --- readthedocs.yml | 1 + requirements-dev.txt | 4 +++- requirements-docs.txt | 1 - requirements.txt | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/readthedocs.yml b/readthedocs.yml index aa93c7915..66da0bc43 100644 --- a/readthedocs.yml +++ b/readthedocs.yml @@ -21,3 +21,4 @@ python: version: 3.7 install: - requirements: requirements-docs.txt + requirements.txt diff --git a/requirements-dev.txt b/requirements-dev.txt index 0709b89f3..96ae02300 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,7 @@ +black codecov +flake8 pre-commit -pypistats[pandas] +pypistats pytest>=4.6 pytest-cov diff --git a/requirements-docs.txt b/requirements-docs.txt index d70347d23..d2f785927 100644 --- a/requirements-docs.txt +++ b/requirements-docs.txt @@ -4,4 +4,3 @@ numpydoc pybtex pygithub sphinxcontrib-bibtex --r requirements.txt diff --git a/requirements.txt b/requirements.txt index 1e34d2b92..1d4046368 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,3 +5,4 @@ matplotlib numpy requests shapely +xarray \ No newline at end of file From b805278afcabada916161a8709c874a90dba710d Mon Sep 17 00:00:00 2001 From: Jessica Date: Fri, 5 Mar 2021 15:24:26 -0500 Subject: [PATCH 6/6] update local_scheme in setup.py Co-authored-by: Wei Ji <23487320+weiji14@users.noreply.github.com> --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b0b2699ec..042cb43bd 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ py_modules=["_icepyx_version"], use_scm_version={ "fallback_version": "unknown", - "local_scheme": "no-local-version", + "local_scheme": "node-and-date", "write_to": "_icepyx_version.py", "write_to_template": 'version = "{version}"\n', },