Manual update of pip requirements

Change-Id: I82e13ddf6c5df57387e9aeb4b35f96e79dd0e9ea
Signed-off-by: beierlm <mark.beierl@canonical.com>

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 6d6c3af..c61b32e 100644 (file)
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #######################################################################################
-bitarray==2.3.5
+bitarray==2.5.1
     # via
     #   -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master
     #   pyangbind
@@ -22,14 +22,14 @@ enum34==1.1.10
     # via
     #   -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master
     #   pyangbind
-lxml==4.7.1
+lxml==4.9.0
     # via
     #   -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master
     #   pyang
     #   pyangbind
 osm-im @ git+https://osm.etsi.org/gerrit/osm/IM.git@master
     # via -r requirements-dev.in
-pyang==2.5.2
+pyang==2.5.3
     # via
     #   -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master
     #   pyangbind
@@ -37,7 +37,7 @@ pyangbind==0.8.1
     # via -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master
 pyyaml==5.4.1
     # via -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master
-regex==2021.11.10
+regex==2022.6.2
     # via
     #   -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master
     #   pyangbind

diff --git a/requirements-test.txt b/requirements-test.txt
index 7589d84..b312377 100644 (file)
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -14,13 +14,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #######################################################################################
-coverage==6.2
+coverage==6.4.1
     # via
     #   -r requirements-test.in
     #   nose2
 mock==4.0.3
     # via -r requirements-test.in
-nose2==0.10.0
+nose2==0.11.0
     # via -r requirements-test.in
 six==1.16.0
     # via nose2

diff --git a/setup.py b/setup.py
index ff87842..1886039 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -12,29 +12,35 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-from setuptools import setup, find_packages
+from setuptools import setup
 
+_name = "osmclient"
+_version_command = ("git describe --match v* --tags --long --dirty", "pep440-git-full")
 _description = "OSM client library and console script"
+_author = "OSM Support"
+_author_email = "osmsupport@etsi.org"
+_maintainer = "OSM Support"
+_maintainer_email = "osmsupport@etsi.org"
+_license = "Apache 2.0"
+_url = "https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=tree"
 
 setup(
-    name="osmclient",
-    version_command=(
-        "git describe --match v* --tags --long --dirty",
-        "pep440-git-full",
-    ),
-    author="ETSI",
-    packages=find_packages(),
-    include_package_data=True,
-    maintainer="Gerardo Garcia",
-    maintainer_email="gerardo.garciadeblas@telefonica.com",
+    name=_name,
+    version_command=_version_command,
     description=_description,
-    license='Apache 2',
-
-    setup_requires=['setuptools-version-command'],
-    test_suite='nose.collector',
+    author=_author,
+    author_email=_author_email,
+    maintainer=_maintainer,
+    maintainer_email=_maintainer_email,
+    url=_url,
+    license=_license,
+    packages=[_name],
+    package_dir={_name: _name},
+    include_package_data=True,
     entry_points={
         "console_scripts": [
             "osm = osmclient.scripts.osm:cli",
         ],
     },
+    setup_requires=['setuptools-version-command'],
 )

diff --git a/tox.ini b/tox.ini
index 5c9b9a9..8997616 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -82,7 +82,7 @@ commands =
 
 #######################################################################################
 [testenv:pip-compile]
-deps =  pip-tools==6.4.0
+deps =  pip-tools==6.6.2
 skip_install = true
 whitelist_externals = bash
         [