Skip to content

Commit 069bf63

Browse files
authored
Fix 1.0.0-beta2 release: Merge pull request #19 from Pabloo22/development
Fix 1.0.0-beta2 release
2 parents d48de97 + 89af150 commit 069bf63

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

README.md

-4
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,7 @@ Although this version is not stable and may contain breaking changes in subseque
6565
- **Agent-Task Graphs**: Encode instances as agent-task graphs (introduced in [ScheduleNet paper](https://arxiv.org/abs/2106.03051)). See [Agent-Task Graph](https://github.com/Pabloo22/job_shop_lib/blob/main/docs/source/examples/07-Agent-Task-Graph.ipynb).
6666
- Build your own custom graphs with the `JobShopGraph` class.
6767

68-
<<<<<<< HEAD
6968
- **Gymnasium Environments**: Two environments for solving the problem with graph neural networks (GNNs) or any other method, and reinforcement learning (RL). See [SingleJobShopGraphEnv](https://github.com/Pabloo22/job_shop_lib/blob/main/docs/source/examples/09-SingleJobShopGraphEnv.ipynb) and [MultiJobShopGraphEnv](https://github.com/Pabloo22/job_shop_lib/blob/main/docs/source/examples/10-MultiJobShopGraphEnv.ipynb).
70-
=======
71-
- **Gymnasium Environments**: Two environments for solving the problem with Graph Neural Networks (GNNs) or any other method, and Reinforcement Learning (RL). See [SingleJobShopGraphEnv](https://github.com/Pabloo22/job_shop_lib/blob/main/docs/source/examples/09-SingleJobShopGraphEnv.ipynb) and [MultiJobShopGraphEnv](https://github.com/Pabloo22/job_shop_lib/blob/main/docs/source/examples/10-MultiJobShopGraphEnv.ipynb).
72-
>>>>>>> 031bdf3 ([Docs] Update links in README to point to the correct GitHub URLs for tutorials and examples)
7369

7470
<!-- end key features -->
7571

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "job-shop-lib"
3-
version = "1.0.0-beta.1"
3+
version = "1.0.0-beta.2"
44
description = "An easy-to-use and modular Python library for the Job Shop Scheduling Problem (JSSP)"
55
authors = ["Pabloo22 <[email protected]>"]
66
license = "MIT"

0 commit comments

Comments
 (0)