Merge branch 'master' into develop

# Conflicts: # README.rst # setup.py # src/sliplib/version.py # tests/integration/test_server_client.py
rhjdjong · Dec 2, 2024 · 3fb8576 · 3fb8576
2 parents ae1af90 + 0463b34
commit 3fb8576
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/readthedocs.yml b/readthedocs.yml
@@ -0,0 +1,14 @@
+version: 2
+
+sphinx:
+  configuration: docs/source/conf.py
+
+formats: all
+
+python:
+  version: 3.8
+  install:
+    - method: pip
+      path: .
+      extra_requirements:
+        - docs
diff --git a/setup.py b/setup.py
diff --git a/src/sliplib/version.py b/src/sliplib/version.py
@@ -4,4 +4,4 @@
 
 """Indicates the version of sliplib."""
 
-__version__ = "0.7.0"
+__version__ = '0.6.2'
diff --git a/tests/integration/test_server_client.py b/tests/integration/test_server_client.py
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@

		"""Indicates the version of sliplib."""

		__version__ = "0.7.0"
		__version__ = '0.6.2'