diff --git a/cmake/python.cmake b/cmake/python.cmake index 9efe5230c9..dbfb8fa601 100644 --- a/cmake/python.cmake +++ b/cmake/python.cmake @@ -283,7 +283,7 @@ file(GENERATE # WORKING_DIRECTORY python) configure_file( - ${PROJECT_SOURCE_DIR}/tools/README.pypi.txt + ${PROJECT_SOURCE_DIR}/ortools/python/README.pypi.txt ${PROJECT_BINARY_DIR}/python/README.txt COPYONLY) diff --git a/cmake/vagrant/freebsd/python/Vagrantfile b/cmake/vagrant/freebsd/python/Vagrantfile index 8dc850c48f..0f4afd2025 100644 --- a/cmake/vagrant/freebsd/python/Vagrantfile +++ b/cmake/vagrant/freebsd/python/Vagrantfile @@ -90,7 +90,6 @@ Vagrant.configure("2") do |config| config.vm.provision "file", source: "../../../../examples/tests", destination: "$HOME/project/examples/" config.vm.provision "file", source: "../../../../patches", destination: "$HOME/project/" config.vm.provision "file", source: "../../../../Version.txt", destination: "$HOME/project/" - config.vm.provision "file", source: "../../../../tools/README.pypi.txt", destination: "$HOME/project/tools/" config.vm.provision "devel", type: "shell", inline:<<-SHELL set -x diff --git a/makefiles/Makefile.python.mk b/makefiles/Makefile.python.mk index 710ea498eb..c055b7a66e 100644 --- a/makefiles/Makefile.python.mk +++ b/makefiles/Makefile.python.mk @@ -455,8 +455,8 @@ $(PYPI_ARCHIVE_TEMP_DIR)/ortools: | $(PYPI_ARCHIVE_TEMP_DIR) $(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools: | $(PYPI_ARCHIVE_TEMP_DIR)/ortools $(MKDIR) $(PYPI_ARCHIVE_TEMP_DIR)$Sortools$Sortools -$(PYPI_ARCHIVE_TEMP_DIR)/ortools/README.txt: tools/README.pypi.txt | $(PYPI_ARCHIVE_TEMP_DIR)/ortools - $(COPY) tools$SREADME.pypi.txt $(PYPI_ARCHIVE_TEMP_DIR)$Sortools$SREADME.txt +$(PYPI_ARCHIVE_TEMP_DIR)/ortools/README.txt: ortools/python/README.pypi.txt | $(PYPI_ARCHIVE_TEMP_DIR)/ortools + $(COPY) ortools$Spython$SREADME.pypi.txt $(PYPI_ARCHIVE_TEMP_DIR)$Sortools$SREADME.txt $(PYPI_ARCHIVE_TEMP_DIR)/ortools/LICENSE: LICENSE | $(PYPI_ARCHIVE_TEMP_DIR)/ortools $(COPY) LICENSE $(PYPI_ARCHIVE_TEMP_DIR)$Sortools diff --git a/ortools/python/README.pypi.txt b/ortools/python/README.pypi.txt new file mode 100644 index 0000000000..161e70f0e5 --- /dev/null +++ b/ortools/python/README.pypi.txt @@ -0,0 +1,19 @@ +This project hosts operations research tools developed at Google and +made available as open source under the Apache 2.0 License. + +OR-Tools includes solvers for: + +- Constraint Programming + - CP-SAT solver: A constraint programming solver that uses SAT (satisfiability) + methods. + - Original CP solver: A constraint programming solver. +- Linear and Mixed-Integer Programming + - Glop: A linear optimizer to find the optimal value of a linear objective + function, given a set of linear inequalities as constraints. + - Wrappers around commercial and other open source solvers, including mixed + integer solvers: CBC, CLP, GLPK, Gurobi or SCIP +- Vehicle Routing + A specialized library for identifying best vehicle routes given constraints. +- Graph Algorithms + Code for finding shortest paths in graphs, min-cost flows, max flows, and + linear sum assignments. diff --git a/tools/README.pypi.txt b/tools/README.pypi.txt deleted file mode 100644 index 8b656c781a..0000000000 --- a/tools/README.pypi.txt +++ /dev/null @@ -1,15 +0,0 @@ -This project hosts operations research tools developed at Google and -made available as open source under the Apache 2.0 License. - -The project contains several tools: - -- A Constraint Programming solver -- A Linear Programming solvers -- Wrappers around commercial and other open source solvers, including mixed integer solvers - - CBC, CLP, CPLEX, GLPK, Gurobi, SCIP and XPRESS -- Bin packing and knapsack algorithms -- Graph algorithms: - - shortest paths - - min-cost flow - - max flow - - linear sum assignment