Skip to content
This repository was archived by the owner on Jun 3, 2025. It is now read-only.

Commit 0de9af1

Browse files
author
Kevin Paul
authored
Merge pull request #106 from kmpaul/python3
Update to Python3
2 parents d2bb848 + a3edd85 commit 0de9af1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+9199
-4686
lines changed

.github/workflows/linting.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,4 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v2
1616
- uses: actions/setup-python@v2
17-
with:
18-
python-version: '2.7'
19-
- run: pip install flake8==3.7.9 isort==4.3.21
20-
- run: flake8
21-
- run: isort --recursive -w 100 --check-only
17+
- uses: pre-commit/[email protected]

.github/workflows/pypipublish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ jobs:
2323
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
2424
run: |
2525
python setup.py sdist bdist_wheel
26-
twine upload dist/*
26+
twine upload dist/*

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
python: ['2.7']
22+
python: ['3.6', '3.7', '3.8']
2323
env:
2424
PYTHON: ${{ matrix.python }}
2525
OMPI_MCA_rmaps_base_oversubscribe: '1'

.pre-commit-config.yaml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
exclude: '(docs\/|examples\/)'
2+
3+
repos:
4+
5+
- repo: https://github.com/pre-commit/pre-commit-hooks
6+
rev: v3.2.0
7+
hooks:
8+
- id: trailing-whitespace
9+
- id: end-of-file-fixer
10+
- id: check-docstring-first
11+
- id: check-json
12+
- id: check-yaml
13+
14+
- repo: https://github.com/ambv/black
15+
rev: 20.8b1
16+
hooks:
17+
- id: black
18+
19+
- repo: https://github.com/keewis/blackdoc
20+
rev: v0.1.2
21+
hooks:
22+
- id: blackdoc
23+
24+
- repo: https://gitlab.com/pycqa/flake8
25+
rev: 3.8.3
26+
hooks:
27+
- id: flake8
28+
29+
- repo: https://github.com/asottile/seed-isort-config
30+
rev: v2.2.0
31+
hooks:
32+
- id: seed-isort-config
33+
args: [--exclude=docs/*|examples/*]
34+
35+
- repo: https://github.com/pre-commit/mirrors-isort
36+
rev: v5.5.3
37+
hooks:
38+
- id: isort

CODE_OF_CONDUCT.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Examples of behaviors that contribute to a positive environment include:
1414
* Communicate openly with respect for others, critiquing ideas rather than individuals and gracefully accepting criticism
1515
* Acknowledging the contributions of others
1616
* Avoid personal attacks directed toward other participants
17-
* Be mindful of your surroundings and of your fellow participants
17+
* Be mindful of your surroundings and of your fellow participants
1818
* Alert UCAR staff and suppliers/vendors if you notice a dangerous situation or someone in distress
1919
* Respect the rules and policies of the project and venue
2020

@@ -26,7 +26,7 @@ Examples of unacceptable behavior include, but are not limited to:
2626
* Personal attacks directed at other guests, members, participants, etc.
2727
* Publishing others' private information, such as a physical or electronic address, without explicit permission
2828
* Alarming, intimidating, threatening, or hostile comments or conduct
29-
* Inappropriate use of nudity and/or sexual images
29+
* Inappropriate use of nudity and/or sexual images
3030
* Threatening or stalking anyone, including a participant
3131
* Other conduct which could reasonably be considered inappropriate in a professional setting
3232

@@ -50,7 +50,7 @@ Project administrators are also expected to keep this Code of Conduct updated wi
5050

5151
## Reporting
5252
Instances of unacceptable behavior can be brought to the attention of the project administrator(s) who may take any action as outlined in the [Consequences](#consequences) section below.
53-
However, making a report to a project administrator is not considered an 'official report' to UCAR.
53+
However, making a report to a project administrator is not considered an 'official report' to UCAR.
5454

5555
Instances of unacceptable behavior may also be reported directly to UCAR pursuant to [UCAR's Harassment Reporting and Complaint Procedure](https://www2.fin.ucar.edu/procedures/hr/harassment-reporting-and-complaint-procedure), or anonymously through [UCAR's EthicsPoint Hotline](https://www2.fin.ucar.edu/ethics/anonymous-reporting).
5656

LICENSE.rst

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5,47 +5,47 @@ UNIVERSITY CORPORATION FOR ATMOSPHERIC RESEARCH
55
Contributor License Agreement
66
-----------------------------
77

8-
This Contributor License Agreement ("Agreement") is a legal agreement between you (in your capacity as an individual and
9-
as an agent for your company, institution or other entity) (collectively, "you" or "your" or "Licensee") and the University
8+
This Contributor License Agreement ("Agreement") is a legal agreement between you (in your capacity as an individual and
9+
as an agent for your company, institution or other entity) (collectively, "you" or "your" or "Licensee") and the University
1010
Corporation for Atmospheric Research ("UCAR").
1111

12-
1. **License Grant to Technology.** UCAR grants to Licensee a restricted, royalty-free, perpetual, nonexclusive,
13-
nontransferable, noncommercial license to copy, modify, enhance, improve and use the NCAR PyConform code set for
14-
transformation and standardization of NetCDF datasets into the approved formats for publication (**Technology**)
15-
for research purposes and for collaborating with UCAR only; provided, however, that Licensee does not commercialize,
16-
sell, license, distribute, or transfer the Technology, or any work that contains the Technology. Licensee may freely
17-
use the data and results from the Technology. Licensee shall note in all publications of data or results that this
18-
Technology is provided by UCAR and the NCAR Computational and Information Systems Laboratory. Licensee must reproduce
19-
all copyright notices and other proprietary notices on any copies of the Technology, and Licensee shall not remove any
12+
1. **License Grant to Technology.** UCAR grants to Licensee a restricted, royalty-free, perpetual, nonexclusive,
13+
nontransferable, noncommercial license to copy, modify, enhance, improve and use the NCAR PyConform code set for
14+
transformation and standardization of NetCDF datasets into the approved formats for publication (**Technology**)
15+
for research purposes and for collaborating with UCAR only; provided, however, that Licensee does not commercialize,
16+
sell, license, distribute, or transfer the Technology, or any work that contains the Technology. Licensee may freely
17+
use the data and results from the Technology. Licensee shall note in all publications of data or results that this
18+
Technology is provided by UCAR and the NCAR Computational and Information Systems Laboratory. Licensee must reproduce
19+
all copyright notices and other proprietary notices on any copies of the Technology, and Licensee shall not remove any
2020
copyright information appearing in or on the Technology files.
21-
2. **Ownership of Technology.** UCAR owns and retains all title, copyright, and other proprietary interests in the
21+
2. **Ownership of Technology.** UCAR owns and retains all title, copyright, and other proprietary interests in the
2222
Technology, including any copies thereof. No ownership rights of any kind are transferred to you.
23-
3. **Licensee Contributions.** Licensee shall submit contributions to the Technology to UCAR through the collaboration
24-
tools provided by UCAR. "Contribution" shall mean any independent original work of authorship, including any enhancements,
25-
improvements, modifications, additions, bug fixes, patches, or upgrades to the Technology that is intentionally submitted
26-
by you to UCAR for inclusion in the Technology. You are the owner of your Contributions, but you acknowledge that UCAR
23+
3. **Licensee Contributions.** Licensee shall submit contributions to the Technology to UCAR through the collaboration
24+
tools provided by UCAR. "Contribution" shall mean any independent original work of authorship, including any enhancements,
25+
improvements, modifications, additions, bug fixes, patches, or upgrades to the Technology that is intentionally submitted
26+
by you to UCAR for inclusion in the Technology. You are the owner of your Contributions, but you acknowledge that UCAR
2727
retains ownership of the Technology.
28-
4. **License Grant to Licensee Contributions.** You hereby grant to UCAR, and to any recipients of the Technology distributed
29-
by UCAR, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license to reproduce, incorporate freely into the
30-
Technology, sublicense, display, and distribute your Contributions. You represent that you are legally entitled to grant the
28+
4. **License Grant to Licensee Contributions.** You hereby grant to UCAR, and to any recipients of the Technology distributed
29+
by UCAR, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license to reproduce, incorporate freely into the
30+
Technology, sublicense, display, and distribute your Contributions. You represent that you are legally entitled to grant the
3131
above license. If your employer(s) has rights to intellectual property that you create that includes your Contributions, you
3232
acknowledge that you are allowed to make Contributions on behalf of that employer.
3333
5. **Disclaimer of Warranty/Noninfringement.** THE TECHNOLOGY IS SUPPLIED **AS IS** WITHOUT WARRANTY OF ANY KIND. UCAR DISCLAIMS
34-
ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION, ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, ORIGINALITY,
35-
MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE WITH REGARD TO THE TECHNOLOGY PROVIDED HEREUNDER. UCAR MAKES NO
36-
REPRESENTATIONS THAT THE USE, OPERATION, SALE, PERFORMANCE, MODIFICATION, REPRODUCTION, DISPLAY OF THE TECHNOLOGY WILL
34+
ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION, ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, ORIGINALITY,
35+
MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE WITH REGARD TO THE TECHNOLOGY PROVIDED HEREUNDER. UCAR MAKES NO
36+
REPRESENTATIONS THAT THE USE, OPERATION, SALE, PERFORMANCE, MODIFICATION, REPRODUCTION, DISPLAY OF THE TECHNOLOGY WILL
3737
NOT INFRINGE UPON ANY PROPRIETARY RIGHTS OF ANY THIRD PARTY.
38-
6. **Limitation of Liability.** IN NO EVENT SHALL UCAR BE LIABLE TO LICENSEE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL
39-
OR CONSEQUENTIAL DAMAGES, INCLUDING LOST OR ANTICIPATED PROFITS OR REVENUE INCURRED BY LICENSEE OR ANY THIRD PARTY, WHETHER
40-
IN AN ACTION IN CONTRACT OR TORT, EVEN IF UCAR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES IN THE PERFORMANCE OF
41-
THIS LICENSE, OR RELATED TO THE TECHNOLOGY. LICENSEE ALSO ACKNOWLEDGES THAT ANY BREACH OF ITS OBLIGATIONS WITH RESPECT TO
42-
PROPRIETARY RIGHTS WILL CAUSE UCAR IRREPARABLE INJURY FOR WHICH THERE ARE INADEQUATE REMEDIES AT LAW. AS SUCH, UCAR SHALL
38+
6. **Limitation of Liability.** IN NO EVENT SHALL UCAR BE LIABLE TO LICENSEE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL
39+
OR CONSEQUENTIAL DAMAGES, INCLUDING LOST OR ANTICIPATED PROFITS OR REVENUE INCURRED BY LICENSEE OR ANY THIRD PARTY, WHETHER
40+
IN AN ACTION IN CONTRACT OR TORT, EVEN IF UCAR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES IN THE PERFORMANCE OF
41+
THIS LICENSE, OR RELATED TO THE TECHNOLOGY. LICENSEE ALSO ACKNOWLEDGES THAT ANY BREACH OF ITS OBLIGATIONS WITH RESPECT TO
42+
PROPRIETARY RIGHTS WILL CAUSE UCAR IRREPARABLE INJURY FOR WHICH THERE ARE INADEQUATE REMEDIES AT LAW. AS SUCH, UCAR SHALL
4343
BE ENTITLED TO EQUITABLE RELIEF IN ADDITION TO ALL OTHER REMEDIES AVAILABLE TO IT.
44-
7. **High Risk Activities.** The Technology is research-based, not fault-tolerant, and is not designed, manufactured or
45-
intended for use in any operational activities including activities or hazardous environments requiring fail-safe
46-
performance, such as in aircraft navigation or communication systems, air traffic control, weapons systems, nuclear
47-
power plants or critical 24/7 operations, in which the failure of the Technology could lead directly to death, personal
48-
injury, or severe physical or environmental damage (**High Risk Activities**). Accordingly, UCAR specifically disclaims
49-
any express or implied warranties of fitness for High Risk Activities. You agree that UCAR shall not be liable for any
44+
7. **High Risk Activities.** The Technology is research-based, not fault-tolerant, and is not designed, manufactured or
45+
intended for use in any operational activities including activities or hazardous environments requiring fail-safe
46+
performance, such as in aircraft navigation or communication systems, air traffic control, weapons systems, nuclear
47+
power plants or critical 24/7 operations, in which the failure of the Technology could lead directly to death, personal
48+
injury, or severe physical or environmental damage (**High Risk Activities**). Accordingly, UCAR specifically disclaims
49+
any express or implied warranties of fitness for High Risk Activities. You agree that UCAR shall not be liable for any
5050
claims or damages arising from High Risk Activities.
5151
8. **Controlling Law.** This Agreement shall be governed by the laws of the State of Colorado and of the United States.

ci/environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ dependencies:
1818
- pip:
1919
- asaptools
2020
- cf_units
21-
- dreqPy
21+
- dreqPy

0 commit comments

Comments
 (0)