Updated packages and packaging

to allow use of "nexinfosys" package with other high level packages
MAGIC-nexus · Mar 15, 2021 · 12b2eb5 · 12b2eb5
1 parent 793acd6
commit 12b2eb5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/requirements-as-package.txt b/requirements-as-package.txt
@@ -22,7 +22,7 @@ requests_cache==0.4.13
 SQLAlchemy>=1.3.3
 pyparsing>=2.2.0
 numpy>=1.16.0
-pandas==1.0.3
+pandas>=1.0.3
 pandas_datareader>=0.8.1
 pyarrow==1.0.0
 pandaSDMX==0.9
@@ -31,14 +31,14 @@ regex>=2017.11.9
 chardet>=3.0.4
 aadict>=0.2.3
 anytree>=2.2.2
-networkx==2.2
+networkx>=2.2
 multidict>=3.3.2
 xmltodict>=0.11.0
 cubes==1.1
 Pint>=0.8.1
 uncertainties>=3.1.2
 xlrd==1.1.0
-openpyxl==2.4.8
+openpyxl==3.0.7
 xlsxwriter==1.0.4
 lxml==4.6.2
 jsonpickle==1.2

diff --git a/requirements.txt b/requirements.txt
@@ -37,25 +37,24 @@ redis>=2.10.6
 #redislite>=5.0.124623  # Disabled because it leads to a problem in "setup.py". It is explicitly used in the Dockerfile
 pyparsing>=2.2.0
 numpy>=1.16.0
-pandas==1.0.3
-pandas_datareader>=0.8.1
+pandas>=1.0.3
+pandas_datareader>=0.9.0
 pyarrow==1.0.0
 pandaSDMX==0.9
 sdmx>=0.2.10
 regex>=2017.11.9
 chardet>=3.0.4
 aadict>=0.2.3
 anytree>=2.2.2
-networkx==2.2
+networkx>=2.2
 multidict>=3.3.2
 xmltodict>=0.11.0
 cubes==1.1
 Pint>=0.8.1
 uncertainties>=3.1.2
 xlrd==1.1.0
-#openpyxl==2.5.0b1
+#openpyxl==3.0.7  # TODO - Needed to work with NIS-frontend - Convert to the latest version, only 2.4.8 works...
 openpyxl==2.4.8
-#openpyxl==2.6.2
 xlsxwriter==1.0.4
 #koala2==0.0.17
 lxml==4.6.2

diff --git a/setup.py b/setup.py
@@ -10,7 +10,7 @@
 #
 # Modify version code in "setup.py" (this file)
 #
-# Build (cd to directory where "setup.py" is)
+# Build (cd to directory where "setup.py" is) ###
 # python3 setup.py sdist bdist_wheel
 #
 # Upload:
@@ -36,7 +36,7 @@
 # from Cython.Distutils import build_ext
 
 package_name = 'nexinfosys'
-version = '0.40'
+version = '0.43'
 
 
 def parse_requirements(strs):