Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
Mapserver REST API
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Redmine
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Miscellaneous
Mapserver REST API
Commits
e19af5f7
"src/git@git.neogeo.fr:ext_matthieu/geocontrib-frontend.git" did not exist on "775c6a18062d903d82c6654a6414a96f2105b60f"
Commit
e19af5f7
authored
4 years ago
by
m431m
Browse files
Options
Downloads
Plain Diff
Merge branch 'fix/urljoin-missing' into 'master'
Fix/urljoin missing See merge request
!1
parents
8683c3bf
8f090e29
No related branches found
No related tags found
1 merge request
!1
Fix/urljoin missing
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
setup.py
+1
-1
1 addition, 1 deletion
setup.py
src/mra.py
+1
-0
1 addition, 0 deletions
src/mra.py
with
2 additions
and
1 deletion
setup.py
+
1
−
1
View file @
e19af5f7
...
...
@@ -26,7 +26,7 @@ import os.path
from
setuptools
import
setup
version
=
'
1.1.
0
'
version
=
'
1.1.
1
'
def
parse_requirements
(
filename
):
...
...
This diff is collapsed.
Click to expand it.
src/mra.py
+
1
−
0
View file @
e19af5f7
...
...
@@ -42,6 +42,7 @@ import os
import
os.path
try
:
from
urllib.parse
import
urlparse
from
urllib.parse
import
urljoin
except
ImportError
:
from
urlparse
import
urlparse
from
urlparse
import
urljoin
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment