Merge pull request #23 from nicholasmhughes/fix-deps-for-salt-conflict

Fix deps for salt conflict

Author: nicholasmhughes

CHANGELOG.md

@@ -4,55 +4,50 @@ This project uses [Semantic Versioning](https://semver.org/) - MAJOR.MINOR.PATCH
 
 # Changelog
 
-Saltext.Prometheus 2.0.2 (2023-03-13)
-=====================================
+# Saltext.Prometheus 2.0.3 (2023-08-14)
 
-Fixed
------
+### Fixed
+
+- Fix salt deps by removing them (#22)
+
+
+# Saltext.Prometheus 2.0.2 (2023-03-13)
+
+### Fixed
 
 - Fix mode set to int octal instead of octal notation (#21)
 
 
-Saltext.Prometheus 2.0.1 (2023-03-12)
-=====================================
+# Saltext.Prometheus 2.0.1 (2023-03-12)
 
-Fixed
------
+### Fixed
 
 - Fix KeyError thrown when requiring state is not run (#20)
 
 
-Saltext.Prometheus 2.0.0 (2022-10-13)
-=====================================
+# Saltext.Prometheus 2.0.0 (2022-10-13)
 
-Added
------
+### Added
 
 - Add ability to use prometheus_client library (#2)
 
 
-Saltext.Prometheus 1.1.1 (2022-05-04)
-=====================================
+# Saltext.Prometheus 1.1.1 (2022-05-04)
 
-Added
------
+### Added
 
 - Hide raw version numbers to normalize data on release version (#6)
 
 
-Saltext.Prometheus 1.0.1 (2022-03-18)
-=====================================
+# Saltext.Prometheus 1.0.1 (2022-03-18)
 
-Fixed
------
+### Fixed
 
 - Fix textfile output to view None result as success (#3)
 
 
-Saltext.Prometheus 1.0.0 (2022-01-29)
-=====================================
+# Saltext.Prometheus 1.0.0 (2022-01-29)
 
-Added
------
+### Added
 
 - Initial version of Prometheus Text Exposition Format Returner

setup.cfg

@@ -38,8 +38,6 @@ setup_requires =
   setuptools>=50.3.2
   setuptools-declarative-requirements
 install_requires =
-  salt>=3002
-  jinja2<=3.0.1
   prometheus_client
   # Add other module install requirements above this line
 
@@ -57,17 +55,17 @@ salt.loader=
 [options.extras_require]
 tests =
   mock==3.0.5
-  pytest==6.2.4
-  pytest-salt-factories==0.906.0
-  jinja2<3.1
+  pytest==7.2.0
+  pytest-salt-factories>=1.0.0rc23
+  Jinja2
 dev =
-  nox==2021.6.12
+  nox==2022.1.7
   pre-commit==2.13.0
   pylint<2.14.0
   SaltPyLint
 docs =
   sphinx>=3.5.1
-  jinja2<3.1
+  Jinja2
   furo
   sphinx-copybutton
   sphinx-prompt

src/saltext/prometheus/version.py

@@ -1,2 +1,2 @@
 # pylint: disable=missing-module-docstring
-__version__ = "2.0.2"
+__version__ = "2.0.3"