Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
geoarray
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Daniel Scheffler
geoarray
Commits
0938f9f5
Commit
0938f9f5
authored
1 year ago
by
Daniel Scheffler
Browse files
Options
Downloads
Plain Diff
Merge branch 'maintenance/drop_37_add_311' into 'main'
Maintenance/drop 37 add 311 See merge request
!43
parents
18f43999
024f1782
No related branches found
No related tags found
1 merge request
!43
Maintenance/drop 37 add 311
Pipeline
#61536
passed
1 year ago
Stage: test
Changes
4
Pipelines
3
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
CONTRIBUTING.rst
+1
-1
1 addition, 1 deletion
CONTRIBUTING.rst
HISTORY.rst
+1
-0
1 addition, 0 deletions
HISTORY.rst
setup.py
+2
-2
2 additions, 2 deletions
setup.py
tests/CI_docker/context/environment_geoarray.yml
+1
-1
1 addition, 1 deletion
tests/CI_docker/context/environment_geoarray.yml
with
5 additions
and
4 deletions
CONTRIBUTING.rst
+
1
−
1
View file @
0938f9f5
...
...
@@ -101,7 +101,7 @@ Before you submit a pull request, check that it meets these guidelines:
2. If the pull request adds functionality, the docs should be updated. Put
your new functionality into a function with a docstring, and add the
feature to the list in README.rst.
3. The pull request should work for Python
2.6, 2.7,
3.
3
, 3.
4
, 3.
5
and 3.
6, and for PyPy
. Check
3. The pull request should work for Python 3.
8
, 3.
9
, 3.
10,
and 3.
11
. Check
https://travis-ci.org/danschef/geoarray/pull_requests
and make sure that the tests pass for all supported Python versions.
...
...
This diff is collapsed.
Click to expand it.
HISTORY.rst
+
1
−
0
View file @
0938f9f5
...
...
@@ -10,6 +10,7 @@ History
* !40: Added workaround for missing PROJ_DATA environment variable.
* !41: Revised GeoArray.show to be compatible with new versions of holoviews.
* !42: Dropped support for cartopy<0.20 and removed pyepsg requirement as cartopy>=0.20 uses pyproj instead.
* !43: Dropped support for Python 3.7 and added support for Python 3.11.
0.16.1 (16.02.2023)
...
...
This diff is collapsed.
Click to expand it.
setup.py
+
2
−
2
View file @
0938f9f5
...
...
@@ -85,12 +85,12 @@ setup(
'
Intended Audience :: Developers
'
,
'
License :: OSI Approved :: Apache Software License
'
,
'
Natural Language :: English
'
,
'
Programming Language :: Python :: 3.7
'
,
'
Programming Language :: Python :: 3.8
'
,
'
Programming Language :: Python :: 3.9
'
,
'
Programming Language :: Python :: 3.10
'
,
'
Programming Language :: Python :: 3.11
'
],
python_requires
=
'
>3.
7
'
,
python_requires
=
'
>
=
3.
8
'
,
test_suite
=
'
tests
'
,
tests_require
=
req_test
,
setup_requires
=
req_setup
,
...
...
This diff is collapsed.
Click to expand it.
tests/CI_docker/context/environment_geoarray.yml
+
1
−
1
View file @
0938f9f5
...
...
@@ -4,7 +4,7 @@ channels: &id1
-
conda-forge
dependencies
:
-
python=3.
*
.*
-
python
>
=3.
8
.*
-
pip
# avoids that conda uses the wrong pip
-
cartopy>=0.20
# older versions require pyepsg
-
gdal>=2.1.0
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment