Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Python 3 #1437

Draft
wants to merge 86 commits into
base: master
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
54e80de
Remove pysqlite from requirements.txt
mauzey1 May 10, 2019
4770817
Run 2to3 on all Python code
mauzey1 May 10, 2019
0d9354d
Remove periods from imports in the installation Python scripts
mauzey1 May 10, 2019
50a079b
Turn values into strings for ConfigParser
mauzey1 May 10, 2019
5bdde50
Fix indent
mauzey1 May 10, 2019
f5568f8
Remove importing 'join' and 'replace' from module 'string'
mauzey1 May 10, 2019
925d191
Add changes from ESGF devel
mauzey1 May 24, 2019
c26fd56
Replace StringIO.StringIO with io.StringIO
mauzey1 May 24, 2019
7ca5774
Changed ConfigParser.ConfigParser to configparser.ConfigParser
mauzey1 May 24, 2019
e227772
Add "from __future__ import unicode_literals" back to files
mauzey1 May 24, 2019
76498ad
Remove extra line
mauzey1 May 24, 2019
c7473e8
Fix exception and print for Python 3.
mauzey1 May 29, 2019
9ee5e32
Change 'from . import cog.views' to 'import cog.views'
mauzey1 Jun 3, 2019
6348763
Change str and unicode to bytes and text
mauzey1 Jun 4, 2019
6944ad1
Use psycopg2 >=2.7 for Python 3.7 support due to use of 'async' as a …
mauzey1 Jun 7, 2019
7ea2827
Updated packages in requirements.txt; updated Django to 2.2
mauzey1 Jun 7, 2019
6c7253b
change django.core.urlresolvers to django.urls
mauzey1 Jun 7, 2019
15f8e2a
change MIDDLEWARE_CLASSES to MIDDLEWARE in settings.py
mauzey1 Jun 8, 2019
78be6c0
Remove parentheses from User.is_authenticated and User.is_anonymous
mauzey1 Jun 8, 2019
9c002d1
Add on_delete=models.CASCADE to ForeignKey calls
mauzey1 Jul 1, 2019
a426c00
Remove include function for admin URLs
mauzey1 Jul 27, 2019
85ba1f7
Get login and logout from django.contrib.auth
mauzey1 Jul 27, 2019
70983af
Middleware now accepts get_response argument
mauzey1 Jul 27, 2019
81c5863
Replace login and logout with LoginView and LogoutView
mauzey1 Jul 31, 2019
abcc805
Put ignore-case expression (?i) at the end of the regex pattern
mauzey1 Aug 1, 2019
32a9bbc
Replace name of field with queryset=Project.objects.all()
mauzey1 Aug 1, 2019
c1c8896
Replace string decode
mauzey1 Aug 1, 2019
40f78d9
Merge remote-tracking branch 'esgf/devel' into python_3
mauzey1 Aug 1, 2019
7a2cfba
Use floor division when dividing offset by limit when calculating the…
mauzey1 Aug 6, 2019
94ff176
Ensure the project URL parameter is available to determine correct se…
nathanlcarlson Oct 21, 2019
887cd45
User the default search location as the index node for wget scripts
nathanlcarlson Oct 21, 2019
3bc58cd
Use the default search url for globus file searches
nathanlcarlson Oct 21, 2019
ec8d691
Use project specific search path for metadata displays
nathanlcarlson Oct 21, 2019
2be8a22
Properly spell 'django' in import
nathanlcarlson Oct 21, 2019
d7c9e5b
Use default search path for searching and displaying files
nathanlcarlson Oct 21, 2019
f417bfc
Merge pull request #1420 from EarthSystemCoG/index_node_usage
sashakames Oct 23, 2019
895c7da
Complete the revert to using the transfer api client
nathanlcarlson Oct 24, 2019
cd93efb
merge EarthSystemCoG:devel
mauzey1 Nov 25, 2019
2840e59
Add parentheses to print statements
mauzey1 Nov 25, 2019
0d21145
Update requirements.txt package versions
mauzey1 Nov 25, 2019
88a3b22
Merge branch 'devel' of github.com:EarthSystemCoG/COG into devel
mauzey1 Nov 26, 2019
ed5da0f
Update Globus downloads to use Globus SDK
mauzey1 Nov 13, 2019
b38736d
Merge pull request #1423 from mauzey1/globus-sdk-new2
mauzey1 Dec 3, 2019
96b8a76
Merge branch 'devel' of github.com:EarthSystemCoG/COG into devel
mauzey1 Dec 5, 2019
25e19c1
Merge changes from devel
mauzey1 Dec 5, 2019
467a28e
Apply changes for urllib in Python 3. Change django.core.urlresolver…
mauzey1 Dec 11, 2019
8950f7d
Fix import of views_status in __init__.py
mauzey1 Dec 11, 2019
735d351
cherry pick soay citation update
sashakames Dec 12, 2019
95c268a
Update reading of 'x-cera-rc' header value when displaying citations.
mauzey1 Dec 12, 2019
7ac4442
Merge branch 'v3.15.2-patch1' of https://github.com/sashakames/COG in…
sashakames Dec 12, 2019
f0726ce
up v num
sashakames Dec 12, 2019
9176e31
Merge branch 'v3.15.2-patch1' into devel
sashakames Dec 13, 2019
1d75ac6
Merge branch 'master' into v3.15.2-patch1
sashakames Dec 13, 2019
2179d0c
Merge branch 'devel' of https://github.com/EarthSystemCoG/COG into me…
sashakames Dec 13, 2019
3d12704
Update views_globus
mauzey1 Dec 13, 2019
fdb6567
Fix wget script URL so that it has a '?' even if there are no shards …
mauzey1 Dec 13, 2019
53e8027
Merge branch 'devel' of github.com:EarthSystemCoG/COG into python_3
mauzey1 Dec 13, 2019
b1d0dd4
Merge branch 'devel' of github.com:EarthSystemCoG/COG into devel
mauzey1 Dec 13, 2019
a3cba24
Merge branch 'devel' of github.com:EarthSystemCoG/COG into python_3
mauzey1 Dec 13, 2019
b1b796c
Comment out esgfpid in requirements.txt
mauzey1 Dec 20, 2019
3ff3e5f
When adding pages or links, make label default to the title if the la…
mauzey1 Jan 15, 2020
f42922d
If the constraints field is blank when configuring search, then store…
mauzey1 Jan 29, 2020
a7b03e0
Revert "Use default search path for searching and displaying files"
mauzey1 Mar 12, 2020
740f8b7
Revert "Use project specific search path for metadata displays"
mauzey1 Mar 12, 2020
b3f5a0e
Revert "Use the default search url for globus file searches"
mauzey1 Mar 12, 2020
9a02f72
Revert "User the default search location as the index node for wget s…
mauzey1 Mar 12, 2020
b946a56
Revert "Ensure the project URL parameter is available to determine co…
mauzey1 Mar 12, 2020
ada3121
Merge pull request #1 from mauzey1/python_3_revert_index_node_usage
mauzey1 Mar 13, 2020
b024cb7
Revert "Fix wget script URL so that it has a '?' even if there are no…
mauzey1 Mar 19, 2020
3a324b0
Merge branch 'v3.15.2-patch1' into python_3_revert_index_node_usage
sashakames Apr 20, 2020
d6bd44f
added instruction
sashakames Apr 22, 2020
fccb412
Merge branch 'python_3' of https://github.com/mauzey1/COG into python_3
sashakames May 21, 2020
2154fa4
Merge pull request #2 from EarthSystemCoG/python_3
mauzey1 Jul 15, 2020
b84bbbf
Merge pull request #1431 from mauzey1/python_3
sashakames Sep 17, 2020
814b711
patch for pid/handles
sashakames Jan 14, 2021
607a0de
change url
sashakames Feb 2, 2021
da55d60
Merge branch 'fixsrvname' into python_3
sashakames Feb 2, 2021
6bfd0a9
Merge branch 'python_3' of https://github.com/EarthSystemCoG/COG into…
sashakames Feb 2, 2021
18ab9d1
updates for a 4.0.1
sashakames Feb 4, 2021
66e3b3b
up v num
sashakames Feb 4, 2021
29721cf
fix 3/# character issue
sashakames Feb 25, 2021
e156cf1
permit missing license without breaking
sashakames Feb 7, 2022
ce5e027
bump Django version
sashakames Feb 7, 2022
fdc9e8c
disable redirects via next=
sashakames Feb 15, 2022
296e918
readme
sashakames Feb 16, 2022
cdcb7b2
ensure user detail not shown to others
sashakames May 18, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'devel' of github.com:EarthSystemCoG/COG into devel
mauzey1 committed Nov 26, 2019
commit 88a3b227f7853aff0a4fccdbf77cde1a3213ea76

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.