Commit c573265891bae3d46d1f9b713de76918a37b3811
Exists in
spb-stable
and in
3 other branches
Merge pull request #6227 from jojosch/remove-python-doc
remove remaining python references
Showing
2 changed files
with
1 additions
and
47 deletions
Show diff stats
doc/development/architecture.md
| @@ -30,7 +30,7 @@ To summarize here's the [directory structure of the `git` user home directory](. | @@ -30,7 +30,7 @@ To summarize here's the [directory structure of the `git` user home directory](. | ||
| 30 | 30 | ||
| 31 | ps aux | grep '^git' | 31 | ps aux | grep '^git' |
| 32 | 32 | ||
| 33 | -GitLab has several components to operate. As a system user (i.e. any user that is not the `git` user) it requires a persistent database (MySQL/PostreSQL) and redis database. It also uses Apache httpd or nginx to proxypass Unicorn. As the `git` user it starts Sidekiq and Unicorn (a simple ruby HTTP server running on port `8080` by default). Under the gitlab user there are normally 6 processes: `unicorn_rails master` (1 process), `unicorn_rails worker` (2 processes), `python pygments` (2 processes), `sidekiq` (1 process). Pygments is used by GitLab for syntax highlighting in the web interface. | 33 | +GitLab has several components to operate. As a system user (i.e. any user that is not the `git` user) it requires a persistent database (MySQL/PostreSQL) and redis database. It also uses Apache httpd or nginx to proxypass Unicorn. As the `git` user it starts Sidekiq and Unicorn (a simple ruby HTTP server running on port `8080` by default). Under the gitlab user there are normally 4 processes: `unicorn_rails master` (1 process), `unicorn_rails worker` (2 processes), `sidekiq` (1 process). |
| 34 | 34 | ||
| 35 | ## Repository access | 35 | ## Repository access |
| 36 | 36 |
lib/tasks/gitlab/check.rake
| @@ -312,52 +312,6 @@ namespace :gitlab do | @@ -312,52 +312,6 @@ namespace :gitlab do | ||
| 312 | fix_and_rerun | 312 | fix_and_rerun |
| 313 | end | 313 | end |
| 314 | end | 314 | end |
| 315 | - | ||
| 316 | - def check_python2_exists | ||
| 317 | - print "Has python2? ... " | ||
| 318 | - | ||
| 319 | - # Python prints its version to STDERR | ||
| 320 | - # so we can't just use run("python2 --version") | ||
| 321 | - if run_and_match("which python2", /python2$/) | ||
| 322 | - puts "yes".green | ||
| 323 | - else | ||
| 324 | - puts "no".red | ||
| 325 | - try_fixing_it( | ||
| 326 | - "Make sure you have Python 2.5+ installed", | ||
| 327 | - "Link it to python2" | ||
| 328 | - ) | ||
| 329 | - for_more_information( | ||
| 330 | - see_installation_guide_section "Packages / Dependencies" | ||
| 331 | - ) | ||
| 332 | - fix_and_rerun | ||
| 333 | - end | ||
| 334 | - end | ||
| 335 | - | ||
| 336 | - def check_python2_version | ||
| 337 | - print "python2 is supported version? ... " | ||
| 338 | - | ||
| 339 | - # Python prints its version to STDERR | ||
| 340 | - # so we can't just use run("python2 --version") | ||
| 341 | - | ||
| 342 | - unless run_and_match("which python2", /python2$/) | ||
| 343 | - puts "can't check because of previous errors".magenta | ||
| 344 | - return | ||
| 345 | - end | ||
| 346 | - | ||
| 347 | - if `python2 --version 2>&1` =~ /2\.[567]\.\d/ | ||
| 348 | - puts "yes".green | ||
| 349 | - else | ||
| 350 | - puts "no".red | ||
| 351 | - try_fixing_it( | ||
| 352 | - "Make sure you have Python 2.5+ installed", | ||
| 353 | - "Link it to python2" | ||
| 354 | - ) | ||
| 355 | - for_more_information( | ||
| 356 | - see_installation_guide_section "Packages / Dependencies" | ||
| 357 | - ) | ||
| 358 | - fix_and_rerun | ||
| 359 | - end | ||
| 360 | - end | ||
| 361 | end | 315 | end |
| 362 | 316 | ||
| 363 | 317 |