merge

Author: csparpa

.coveragerc

@@ -8,8 +8,8 @@ exclude_lines =
     pragma: no cover
 
     # Don't complain about missing debug-only code:
-    def __repr__(self):
-    def __str__(self):
+    def __repr__
+    def __str__
 
     # Don't complain if tests don't hit defensive assertion code:
     raise AssertionError
@@ -21,8 +21,8 @@ exclude_lines =
     if __name__ == __main__:
 
     # Exclude dump methods
-    def to_JSON(self):
+    def to_JSON
     def to_XML
-    def _to_DOM(self):
+    def _to_DOM
 
 ignore_errors = True

.gitignore

@@ -12,6 +12,7 @@ sphinx/_build/*
 .tox/*
 .coverage
 tests/integration/.tox/*
+tests/proxy/.tox/*
 .cache
 .eggs/
 htmlcov/*

.travis.yml

@@ -1,9 +1,8 @@
+dist: xenial
 language: python
 python:
-  - "3.4"
-  - "3.5"
-  - "3.6"
-  - "3.7-dev"
+  - "3.7"
+  - "3.8"
 script: tox
 after_success:
   - coveralls
@@ -16,12 +15,13 @@ env:
       - TEST_PYPI_URL=https://test.pypi.org/legacy/
       - PYPI_URL=https://upload.pypi.org/legacy/
 install:
-  - pip install --upgrade pip && pip install -r dev-requirements.txt && pip install .
+  - pip install --upgrade pip && pip install -r requirements.txt && pip install --upgrade -r dev-requirements.txt && pip install .
 cache: pip
 
 stages:
   - test
   - "Local Installation Test"
+  - "Coverage"
   - "Build docs"
   - "Deploy to PyPI"
   - "PyPI Installation Test"
@@ -30,37 +30,32 @@ jobs:
   include:
     - &local_installation_test
       stage: "Local Installation Test"
-      python: 3.4
+      python: "3.7"
       script: bash tests/local_installation_test.sh
     - <<: *local_installation_test
-      python: 3.5
-    - <<: *local_installation_test
-      python: 3.6
-    - <<: *local_installation_test
-      python: "3.7-dev"
+      python: "3.8"
+
+    - &coverage
+      stage: "Coverage"
+      python: "3.7"
+      script: coverage run --rcfile=.coveragerc setup.py test -s tests.unit
+    - <<: *coverage
+      python: "3.8"
 
     - stage: "Build docs"
       script: cd sphinx && make clean && make html
 
     - &deploy_to_pypi
       stage: "Deploy to PyPI"
-      python: 3.4
+      python: "3.7"
       script: bash deploy/deploy_to_pypi.sh
     - <<: *deploy_to_pypi
-      python: 3.5
-    - <<: *deploy_to_pypi
-      python: 3.6
-    - <<: *deploy_to_pypi
-      python: "3.7-dev"
+      python: "3.8"
 
     - &pypi_installation_test
       stage: "PyPI Installation Test"
-      python: 3.4
+      python: "3.7"
       if: branch = master
       script: bash tests/pypi_installation_test.sh
     - <<: *pypi_installation_test
-      python: 3.5
-    - <<: *pypi_installation_test
-      python: 3.6
-    - <<: *pypi_installation_test
-      python: "3.7-dev"
+      python: "3.8"

CONTRIBUTORS.md

@@ -5,33 +5,41 @@ Contributors will be shown in alphabetical order
 
 Code
 ----
-  * [alechewitt] (https://github.com/alechewitt)
-  * [dphildebrandt] (https://github.com/dphildebrandt)
-  * [dstmar] (https://github.com/dstmar)
-  * [ggstuart] (https://github.com/ggstuart)
-  * [lardconcepts] (https://github.com/lardconcepts)
-  * [liato] (https://github.com/liato)
-  * [LukasBoersma] (https://github.com/LukasBoersma)
-  * [Noid] (https://github.com/n0id)
-  * [titilambert] (https://github.com/titilambert)
-  * [txemi] (https://github.com/txemi)
+  * [alechewitt](https://github.com/alechewitt)
+  * [dphildebrandt](https://github.com/dphildebrandt)
+  * [dstmar](https://github.com/dstmar)
+  * [edenhaus](https://github.com/edenhaus)
+  * [ggstuart](https://github.com/ggstuart)
+  * [lardconcepts](https://github.com/lardconcepts)
+  * [liato](https://github.com/liato)
+  * [LukasBoersma](https://github.com/LukasBoersma)
+  * [Noid](https://github.com/n0id)
+  * [titilambert](https://github.com/titilambert)
+  * [txemi](https://github.com/txemi)
+  * [camponez](https://github.com/camponez)
+  * [dev-iks](https://github.com/dev-iks)
+
+Docs
+----
+  * [EJEP](https://github.com/EJEP)
 
 Testing
 -------
-  * [Samuel Yap] (https://github.com/samuelyap)
-  * [Patrick Casbon] (https://github.com/patcas)
+  * [Samuel Yap](https://github.com/samuelyap)
+  * [Patrick Casbon](https://github.com/patcas)
+  * [Tamas Magyar](https://github.com/tamasmagyar)
 
 Packaging and Distribution
 --------------------------
-  * [Diapente] (https://github.com/Diapente)
-  * [Simone-Zabberoni] (https://github.com/Simone-Zabberoni)
+  * [Diapente](https://github.com/Diapente)
+  * [Simone-Zabberoni](https://github.com/Simone-Zabberoni)
 
 Wiki
 ----
-  * [lardconcepts] (https://github.com/lardconcepts)
-  * [richarddunks] (https://github.com/richarddunks)
-  * [solumos] (https://github.com/solumos)
+  * [lardconcepts](https://github.com/lardconcepts)
+  * [richarddunks](https://github.com/richarddunks)
+  * [solumos](https://github.com/solumos)
 
 Logo
 ----
-  * [marlinmm] (https://github.com/marlinmm)
+  * [marlinmm](https://github.com/marlinmm)

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 Claudio Sparpaglione
+Copyright (c) 2019 Claudio Sparpaglione
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

MANIFEST.in

@@ -1,6 +1,2 @@
-include pyowm/pollutionapi30/xsd/*.xsd
-include pyowm/stationsapi30/xsd/*.xsd
-include pyowm/uvindexapi30/xsd/*.xsd
-include pyowm/weatherapi25/cityids/*.gz
-include pyowm/weatherapi25/xsd/*.xsd
-include pyowm/docs/*.md
+include pyowm/requirements.txt
+include pyowm/commons/cityids/*.bz2

Pipfile

@@ -4,13 +4,23 @@ verify_ssl = true
 name = "pypi"
 
 [dev-packages]
-coverage = "==3.7.1"
-pytest = "==3.0.3"
-Sphinx = "==1.2.1"
-tox = "==1.9.2"
-virtualenv = "==12.0.7"
-twine = "==1.11.0"
+coverage = "*"
+coveralls = "*"
+Jinja2 = "*"
+pip = ">=18.0"
+pproxy = "==2.2.0"
+pytest = "*"
+recommonmark = "*"
+Sphinx = "*"
+sphinx-readable-theme = ""==1.3.0"
+tox = "*"
+tox-travis = "*"
+virtualenv = "*"
+twine = "*"
+
 
 [packages]
 requests = "<3,==2.20.0"
 geojson = "<3,==2.3.0"
+PySocks = "<2,==1.7.1"
+requests[socks] = "*"